http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/39cecfc7/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java index 744b3a1..fc10699 100755 --- a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java +++ b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java @@ -15,6 +15,7 @@ package org.apache.juneau.microservice.resources; import static java.util.logging.Level.*; import static javax.servlet.http.HttpServletResponse.*; import static org.apache.juneau.html.HtmlDocSerializerContext.*; +import static org.apache.juneau.http.HttpMethodName.*; import java.io.*; import java.net.*; @@ -119,7 +120,7 @@ public class DirectoryResource extends Resource { * file or directory. * @throws Exception If file could not be read or access was not granted. */ - @RestMethod(name="GET", path="/*", + @RestMethod(name=GET, path="/*", description="On directories, returns a directory listing.\nOn files, returns information about the file.", converters={Queryable.class} ) @@ -156,7 +157,7 @@ public class DirectoryResource extends Resource { * @return The message <js>"File deleted"</js> if successful. * @throws Exception If file could not be read or access was not granted. */ - @RestMethod(name="DELETE", path="/*", + @RestMethod(name=DELETE, path="/*", description="Delete a file on the file system." ) public Object doDelete(RestRequest req) throws Exception { @@ -177,7 +178,7 @@ public class DirectoryResource extends Resource { * @return The message <js>"File added"</js> if successful. * @throws Exception If file could not be read or access was not granted. */ - @RestMethod(name="PUT", path="/*", + @RestMethod(name=PUT, path="/*", description="Add or overwrite a file on the file system." ) public Object doPut(RestRequest req) throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/39cecfc7/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java index 4e9938f..e9c54c6 100755 --- a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java +++ b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java @@ -16,6 +16,7 @@ import static javax.servlet.http.HttpServletResponse.*; import static org.apache.juneau.html.HtmlDocSerializerContext.*; import static org.apache.juneau.rest.annotation.HookEvent.*; import static org.apache.juneau.internal.StringUtils.*; +import static org.apache.juneau.http.HttpMethodName.*; import java.io.*; import java.net.URI; @@ -92,7 +93,7 @@ public class LogsResource extends Resource { * @throws Exception */ @RestMethod( - name="GET", + name=GET, path="/*", swagger=@MethodSwagger( responses={@Response(200),@Response(404)} @@ -265,7 +266,7 @@ public class LogsResource extends Resource { * @throws Exception */ @RestMethod( - name="DELETE", + name=DELETE, path="/*", swagger=@MethodSwagger( responses={@Response(200),@Response(404)} http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/39cecfc7/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/ShutdownResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/ShutdownResource.java b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/ShutdownResource.java index 5ef8d9f..be66963 100755 --- a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/ShutdownResource.java +++ b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/ShutdownResource.java @@ -12,6 +12,8 @@ // *************************************************************************************************************************** package org.apache.juneau.microservice.resources; +import static org.apache.juneau.http.HttpMethodName.*; + import org.apache.juneau.microservice.*; import org.apache.juneau.rest.annotation.*; @@ -32,7 +34,7 @@ public class ShutdownResource extends Resource { * @return The string <js>"OK"</js>. * @throws Exception */ - @RestMethod(name="GET", path="/", description="Show contents of config file.") + @RestMethod(name=GET, path="/", description="Show contents of config file.") public String shutdown() throws Exception { new Thread( new Runnable() { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/39cecfc7/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/HelloWorldResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/HelloWorldResource.java b/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/HelloWorldResource.java index 04edc2e..aacdf36 100755 --- a/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/HelloWorldResource.java +++ b/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/HelloWorldResource.java @@ -12,6 +12,8 @@ // *************************************************************************************************************************** package org.apache.juneau.microservice.sample; +import static org.apache.juneau.http.HttpMethodName.*; + import org.apache.juneau.microservice.Resource; import org.apache.juneau.rest.annotation.RestMethod; import org.apache.juneau.rest.annotation.RestResource; @@ -28,7 +30,7 @@ public class HelloWorldResource extends Resource { private static final long serialVersionUID = 1L; /** GET request handler */ - @RestMethod(name="GET", path="/*") + @RestMethod(name=GET, path="/*") public String sayHello() { return "Hello world!"; } 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/AcceptCharsetResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/AcceptCharsetResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/AcceptCharsetResource.java index 62f67c2..e3c8275 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/AcceptCharsetResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/AcceptCharsetResource.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.*; @@ -36,7 +38,7 @@ public class AcceptCharsetResource extends RestServlet { //==================================================================================================== // Test that Q-values are being resolved correctly. //==================================================================================================== - @RestMethod(name="GET", path="/testQValues") + @RestMethod(name=GET, path="/testQValues") public String testQValues() { return "foo"; } @@ -44,7 +46,7 @@ public class AcceptCharsetResource extends RestServlet { //==================================================================================================== // Validate various Accept-Charset variations. //==================================================================================================== - @RestMethod(name="PUT", path="/testCharsetOnResponse", parsers=TestParser.class, serializers=TestSerializer.class) + @RestMethod(name=PUT, path="/testCharsetOnResponse", parsers=TestParser.class, serializers=TestSerializer.class) public String testCharsetOnResponse(@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/BeanContextPropertiesResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/BeanContextPropertiesResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/BeanContextPropertiesResource.java index f5479b8..c0620cb 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/BeanContextPropertiesResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/BeanContextPropertiesResource.java @@ -12,6 +12,8 @@ // *************************************************************************************************************************** package org.apache.juneau.rest.test; +import static org.apache.juneau.http.HttpMethodName.*; + import java.io.*; import java.util.*; @@ -33,7 +35,7 @@ public class BeanContextPropertiesResource extends RestServletDefault { //==================================================================================================== // Validate that transforms defined on class transform to underlying bean context. //==================================================================================================== - @RestMethod(name="GET", path="/testClassTransforms/{d1}") + @RestMethod(name=GET, path="/testClassTransforms/{d1}") public Reader testClassTransforms(@Path("d1") Date d1, @Query("d2") Date d2, @Header("X-D3") Date d3) throws Exception { DateSwap df = DateSwap.ISO8601DTZ.class.newInstance(); BeanSession session = BeanContext.DEFAULT.createSession(); 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/BpiResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/BpiResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/BpiResource.java index 4c6373e..aa86a79 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/BpiResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/BpiResource.java @@ -12,6 +12,8 @@ // *************************************************************************************************************************** package org.apache.juneau.rest.test; +import static org.apache.juneau.http.HttpMethodName.*; + import org.apache.juneau.annotation.*; import org.apache.juneau.microservice.*; import org.apache.juneau.rest.annotation.*; @@ -29,84 +31,84 @@ public class BpiResource extends ResourceJena { // Validates that the @RestMethod(bpIncludes,bpExcludes) properties work. //==================================================================================================== - @RestMethod(name="GET", path="/test/a1", bpi="MyBeanA: a,_b") + @RestMethod(name=GET, path="/test/a1", bpi="MyBeanA: a,_b") public Object testA1() throws Exception { return new MyBeanA().init(); } - @RestMethod(name="GET", path="/test/a2", bpi="MyBeanA: a") + @RestMethod(name=GET, path="/test/a2", bpi="MyBeanA: a") public Object testA2() throws Exception { return new MyBeanA().init(); } - @RestMethod(name="GET", path="/test/a3", bpi="MyBeanA: _b") + @RestMethod(name=GET, path="/test/a3", bpi="MyBeanA: _b") public Object testA3() throws Exception { return new MyBeanA().init(); } - @RestMethod(name="GET", path="/test/a4", bpi="MyBeanA: a") + @RestMethod(name=GET, path="/test/a4", bpi="MyBeanA: a") public Object testA4() throws Exception { return new MyBeanA().init(); } - @RestMethod(name="GET", path="/test/a5", bpi="MyBeanA: _b") + @RestMethod(name=GET, path="/test/a5", bpi="MyBeanA: _b") public Object testA5() throws Exception { return new MyBeanA().init(); } - @RestMethod(name="GET", path="/test/a6", bpi="MyBeanA: a,_b") + @RestMethod(name=GET, path="/test/a6", bpi="MyBeanA: a,_b") public Object testA6() throws Exception { return new MyBeanA().init(); } - @RestMethod(name="GET", path="/test/b1", bpi="MyBeanB: a,_b") + @RestMethod(name=GET, path="/test/b1", bpi="MyBeanB: a,_b") public Object testB1() throws Exception { return new MyBeanB().init(); } - @RestMethod(name="GET", path="/test/b2", bpi="MyBeanB: a") + @RestMethod(name=GET, path="/test/b2", bpi="MyBeanB: a") public Object testB2() throws Exception { return new MyBeanB().init(); } - @RestMethod(name="GET", path="/test/b3", bpi="MyBeanB: _b") + @RestMethod(name=GET, path="/test/b3", bpi="MyBeanB: _b") public Object testB3() throws Exception { return new MyBeanB().init(); } - @RestMethod(name="GET", path="/test/b4", bpi="MyBeanB: a") + @RestMethod(name=GET, path="/test/b4", bpi="MyBeanB: a") public Object testB4() throws Exception { return new MyBeanB().init(); } - @RestMethod(name="GET", path="/test/b5", bpi="MyBeanB: _b'") + @RestMethod(name=GET, path="/test/b5", bpi="MyBeanB: _b'") public Object testB5() throws Exception { return new MyBeanB().init(); } - @RestMethod(name="GET", path="/test/b6", bpi="MyBeanB: a,_b") + @RestMethod(name=GET, path="/test/b6", bpi="MyBeanB: a,_b") public Object testB6() throws Exception { return new MyBeanB().init(); } - @RestMethod(name="GET", path="/test/c1", bpi="*: a") + @RestMethod(name=GET, path="/test/c1", bpi="*: a") public Object testC1() throws Exception { return new MyBeanA().init(); } - @RestMethod(name="GET", path="/test/c2", bpi="org.apache.juneau.rest.test.BpIncludesResource$MyBeanA: a") + @RestMethod(name=GET, path="/test/c2", bpi="org.apache.juneau.rest.test.BpIncludesResource$MyBeanA: a") public Object testC2() throws Exception { return new MyBeanA().init(); } // Should not match. - @RestMethod(name="GET", path="/test/d1", bpi="MyBean: a") + @RestMethod(name=GET, path="/test/d1", bpi="MyBean: a") public Object testD1() throws Exception { return new MyBeanA().init(); } // Should not match. - @RestMethod(name="GET", path="/test/d2", bpi="MyBean*: a") + @RestMethod(name=GET, path="/test/d2", bpi="MyBean*: a") public Object testD2() throws Exception { return new MyBeanA().init(); } 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/CallbackStringsResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/CallbackStringsResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/CallbackStringsResource.java index 74038b3..69481eb 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/CallbackStringsResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/CallbackStringsResource.java @@ -12,6 +12,8 @@ // *************************************************************************************************************************** package org.apache.juneau.rest.test; +import static org.apache.juneau.http.HttpMethodName.*; + import java.util.*; import org.apache.juneau.*; @@ -30,7 +32,7 @@ public class CallbackStringsResource extends RestServletDefault { //==================================================================================================== // Test GET //==================================================================================================== - @RestMethod(name="GET", path="/") + @RestMethod(name=GET, path="/") public ObjectMap test1(RestRequest req) throws Exception { return new ObjectMap().append("method","GET").append("headers", getFooHeaders(req)).append("content", req.getBody().asString()); } @@ -38,7 +40,7 @@ public class CallbackStringsResource extends RestServletDefault { //==================================================================================================== // Test PUT //==================================================================================================== - @RestMethod(name="PUT", path="/") + @RestMethod(name=PUT, path="/") public ObjectMap testCharsetOnResponse(RestRequest req) throws Exception { return new ObjectMap().append("method","PUT").append("headers", getFooHeaders(req)).append("content", 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/CharsetEncodingsResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/CharsetEncodingsResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/CharsetEncodingsResource.java index d9906f4..d2ecc7e 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/CharsetEncodingsResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/CharsetEncodingsResource.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 org.apache.juneau.*; import org.apache.juneau.parser.*; @@ -68,7 +69,7 @@ public class CharsetEncodingsResource extends RestServlet { } } - @RestMethod(name="PUT", path="/") + @RestMethod(name=PUT, path="/") public String test1(RestRequest req, @Body String in) { return req.getCharacterEncoding() + "/" + in + "/" + req.getCharacterEncoding(); } 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/ClientFuturesResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ClientFuturesResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ClientFuturesResource.java index 0a4202a..35ea462 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ClientFuturesResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ClientFuturesResource.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.*; @@ -28,7 +30,7 @@ public class ClientFuturesResource extends RestServletDefault { //==================================================================================================== // Test GET //==================================================================================================== - @RestMethod(name="GET", path="/") + @RestMethod(name=GET, path="/") public ObjectMap test1(RestRequest req) throws Exception { return new ObjectMap().append("foo","bar"); } 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/ClientVersionResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ClientVersionResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ClientVersionResource.java index 231304c..8e8d489 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ClientVersionResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ClientVersionResource.java @@ -12,6 +12,8 @@ // *************************************************************************************************************************** package org.apache.juneau.rest.test; +import static org.apache.juneau.http.HttpMethodName.*; + import org.apache.juneau.microservice.*; import org.apache.juneau.rest.annotation.*; @@ -33,27 +35,27 @@ public class ClientVersionResource extends Resource { ) public static class DefaultHeader extends Resource { - @RestMethod(name="GET", path="/") + @RestMethod(name=GET, path="/") public String test0() { return "no-version"; } - @RestMethod(name="GET", path="/", clientVersion="[0.0,1.0)") + @RestMethod(name=GET, path="/", clientVersion="[0.0,1.0)") public String test1() { return "[0.0,1.0)"; } - @RestMethod(name="GET", path="/", clientVersion="[1.0,1.0]") + @RestMethod(name=GET, path="/", clientVersion="[1.0,1.0]") public String test2() { return "[1.0,1.0]"; } - @RestMethod(name="GET", path="/", clientVersion="[1.1,2)") + @RestMethod(name=GET, path="/", clientVersion="[1.1,2)") public String test3() { return "[1.1,2)"; } - @RestMethod(name="GET", path="/", clientVersion="2") + @RestMethod(name=GET, path="/", clientVersion="2") public String test4() { return "2"; } @@ -65,27 +67,27 @@ public class ClientVersionResource extends Resource { ) public static class CustomHeader extends Resource { - @RestMethod(name="GET", path="/") + @RestMethod(name=GET, path="/") public String test0() { return "no-version"; } - @RestMethod(name="GET", path="/", clientVersion="[0.0,1.0)") + @RestMethod(name=GET, path="/", clientVersion="[0.0,1.0)") public String test1() { return "[0.0,1.0)"; } - @RestMethod(name="GET", path="/", clientVersion="[1.0,1.0]") + @RestMethod(name=GET, path="/", clientVersion="[1.0,1.0]") public String test2() { return "[1.0,1.0]"; } - @RestMethod(name="GET", path="/", clientVersion="[1.1,2)") + @RestMethod(name=GET, path="/", clientVersion="[1.1,2)") public String test3() { return "[1.1,2)"; } - @RestMethod(name="GET", path="/", clientVersion="2") + @RestMethod(name=GET, path="/", clientVersion="2") public String test4() { return "2"; } 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/ConfigResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ConfigResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ConfigResource.java index d766290..2d9c17c 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ConfigResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ConfigResource.java @@ -12,6 +12,8 @@ // *************************************************************************************************************************** package org.apache.juneau.rest.test; +import static org.apache.juneau.http.HttpMethodName.*; + import org.apache.juneau.ini.*; import org.apache.juneau.microservice.*; import org.apache.juneau.rest.*; @@ -26,12 +28,12 @@ import org.apache.juneau.rest.annotation.*; @SuppressWarnings("serial") public class ConfigResource extends Resource { - @RestMethod(name="GET", path="/") + @RestMethod(name=GET, path="/") public ConfigFile test1(RestRequest req) { return req.getConfigFile(); } - @RestMethod(name="GET", path="/{key}/{class}") + @RestMethod(name=GET, path="/{key}/{class}") public Object test2(RestRequest req, @Path("key") String key, @Path("class") Class<?> c) throws Exception { return req.getConfigFile().getObject(key, c); } 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/ContentResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ContentResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ContentResource.java index d35fd90..3fcf5f5 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ContentResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ContentResource.java @@ -12,6 +12,8 @@ // *************************************************************************************************************************** package org.apache.juneau.rest.test; +import static org.apache.juneau.http.HttpMethodName.*; + import java.util.*; import org.apache.juneau.rest.*; @@ -30,47 +32,47 @@ public class ContentResource extends RestServletDefault { //==================================================================================================== // Basic tests //==================================================================================================== - @RestMethod(name="POST", path="/boolean") + @RestMethod(name=POST, path="/boolean") public boolean testBool(@Body boolean b) { return b; } - @RestMethod(name="POST", path="/Boolean") + @RestMethod(name=POST, path="/Boolean") public Boolean testBoolean(@Body Boolean b) { return b; } - @RestMethod(name="POST", path="/int") + @RestMethod(name=POST, path="/int") public int testInt(@Body int i) { return i; } - @RestMethod(name="POST", path="/Integer") + @RestMethod(name=POST, path="/Integer") public Integer testInteger(@Body Integer i) { return i; } - @RestMethod(name="POST", path="/float") + @RestMethod(name=POST, path="/float") public float testFloat(@Body float f) { return f; } - @RestMethod(name="POST", path="/Float") + @RestMethod(name=POST, path="/Float") public Float testFloat2(@Body Float f) { return f; } - @RestMethod(name="POST", path="/Map") + @RestMethod(name=POST, path="/Map") public TreeMap<String,String> testMap(@Body TreeMap<String,String> m) { return m; } - @RestMethod(name="POST", path="/B") + @RestMethod(name=POST, path="/B") public DTO2s.B testPojo1(@Body DTO2s.B b) { return b; } - @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/main/java/org/apache/juneau/rest/test/DefaultContentTypesResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/DefaultContentTypesResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/DefaultContentTypesResource.java index dbd3d05..ad605be 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/DefaultContentTypesResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/DefaultContentTypesResource.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.parser.*; @@ -47,7 +48,7 @@ public class DefaultContentTypesResource extends RestServlet { /** * Test that default Accept and Content-Type headers on servlet annotation are picked up. */ - @RestMethod(name="PUT", path="/testDefaultHeadersOnServletAnnotation") + @RestMethod(name=PUT, path="/testDefaultHeadersOnServletAnnotation") public String testDefaultHeadersOnServletAnnotation(@Body String in) { return in; } @@ -56,7 +57,7 @@ public class DefaultContentTypesResource extends RestServlet { // Test that default Accept and Content-Type headers on servlet annotation are picked up // when @RestMethod.parsers/serializers annotations are used. //==================================================================================================== - @RestMethod(name="PUT", path="/testRestMethodParsersSerializers", parsers=P3.class, serializers=S3.class) + @RestMethod(name=PUT, path="/testRestMethodParsersSerializers", parsers=P3.class, serializers=S3.class) public String testRestMethodParsersSerializers(@Body String in) { return in; } @@ -65,7 +66,7 @@ public class DefaultContentTypesResource extends RestServlet { // Test that default Accept and Content-Type headers on servlet annotation are picked up // when @RestMethod.addParsers/addSerializers annotations are used. //==================================================================================================== - @RestMethod(name="PUT", path="/testRestMethodAddParsersSerializers", parsers=P3.class, parsersInherit=PARSERS, serializers=S3.class, serializersInherit=SERIALIZERS) + @RestMethod(name=PUT, path="/testRestMethodAddParsersSerializers", parsers=P3.class, parsersInherit=PARSERS, serializers=S3.class, serializersInherit=SERIALIZERS) public String testRestMethodAddParsersSerializers(@Body String in) { return in; } @@ -73,7 +74,7 @@ public class DefaultContentTypesResource extends RestServlet { //==================================================================================================== // Various Accept incantations. //==================================================================================================== - @RestMethod(name="PUT", path="/testAccept") + @RestMethod(name=PUT, path="/testAccept") public String testAccept(@Body String in) { return in; } @@ -82,7 +83,7 @@ public class DefaultContentTypesResource extends RestServlet { // Test that default Accept and Content-Type headers on method annotation are picked up // when @RestMethod.parsers/serializers annotations are used. //==================================================================================================== - @RestMethod(name="PUT", path="/testRestMethodParserSerializerAnnotations", defaultRequestHeaders={"Accept: text/s3","Content-Type: text/p3"}, parsers=P3.class, serializers=S3.class) + @RestMethod(name=PUT, path="/testRestMethodParserSerializerAnnotations", defaultRequestHeaders={"Accept: text/s3","Content-Type: text/p3"}, parsers=P3.class, serializers=S3.class) public String testRestMethodParserSerializerAnnotations(@Body String in) { return in; } @@ -91,7 +92,7 @@ public class DefaultContentTypesResource extends RestServlet { // Test that default Accept and Content-Type headers on method annotation are picked up // when @RestMethod.addParsers/addSerializers annotations are used. //==================================================================================================== - @RestMethod(name="PUT", path="/testRestMethodAddParsersSerializersAnnotations", defaultRequestHeaders={"Accept: text/s3","Content-Type: text/p3"}, parsers=P3.class, parsersInherit=PARSERS, serializers=S3.class, serializersInherit=SERIALIZERS) + @RestMethod(name=PUT, path="/testRestMethodAddParsersSerializersAnnotations", defaultRequestHeaders={"Accept: text/s3","Content-Type: text/p3"}, parsers=P3.class, parsersInherit=PARSERS, serializers=S3.class, serializersInherit=SERIALIZERS) public String testRestMethodAddParsersSerializersAnnotations(@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/ErrorConditionsResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ErrorConditionsResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ErrorConditionsResource.java index 8cb0890..4fdf994 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ErrorConditionsResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ErrorConditionsResource.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 ErrorConditionsResource extends RestServletDefault { //==================================================================================================== // Test non-existent properties //==================================================================================================== - @RestMethod(name="PUT", path="/testNonExistentBeanProperties") + @RestMethod(name=PUT, path="/testNonExistentBeanProperties") public String testNonExistentBeanProperties(@Body Test1 in) { return "OK"; } @@ -40,7 +42,7 @@ public class ErrorConditionsResource extends RestServletDefault { //==================================================================================================== // Test trying to set properties to wrong data type //==================================================================================================== - @RestMethod(name="PUT", path="/testWrongDataType") + @RestMethod(name=PUT, path="/testWrongDataType") public String testWrongDataType(@Body Test2 in) { return "OK"; } @@ -52,7 +54,7 @@ public class ErrorConditionsResource extends RestServletDefault { //==================================================================================================== // Test trying to parse into class with non-public no-arg constructor. //==================================================================================================== - @RestMethod(name="PUT", path="/testParseIntoNonConstructableBean") + @RestMethod(name=PUT, path="/testParseIntoNonConstructableBean") public String testParseIntoNonConstructableBean(@Body Test3a in) { return "OK"; } @@ -65,7 +67,7 @@ public class ErrorConditionsResource extends RestServletDefault { //==================================================================================================== // Test trying to parse into non-static inner class //==================================================================================================== - @RestMethod(name="PUT", path="/testParseIntoNonStaticInnerClass") + @RestMethod(name=PUT, path="/testParseIntoNonStaticInnerClass") public String testParseIntoNonStaticInnerClass(@Body Test3b in) { return "OK"; } @@ -77,7 +79,7 @@ public class ErrorConditionsResource extends RestServletDefault { //==================================================================================================== // Test trying to parse into non-public inner class //==================================================================================================== - @RestMethod(name="PUT", path="/testParseIntoNonPublicInnerClass") + @RestMethod(name=PUT, path="/testParseIntoNonPublicInnerClass") public String testParseIntoNonPublicInnerClass(@Body Test3b1 in) { return "OK"; } @@ -89,7 +91,7 @@ public class ErrorConditionsResource extends RestServletDefault { //==================================================================================================== // Test exception thrown during bean construction. //==================================================================================================== - @RestMethod(name="PUT", path="/testThrownConstructorException") + @RestMethod(name=PUT, path="/testThrownConstructorException") public String testThrownConstructorException(@Body Test3c in) { return "OK"; } @@ -105,7 +107,7 @@ public class ErrorConditionsResource extends RestServletDefault { //==================================================================================================== // Test trying to set parameters to invalid types. //==================================================================================================== - @RestMethod(name="PUT", path="/testSetParameterToInvalidTypes/{a1}") + @RestMethod(name=PUT, path="/testSetParameterToInvalidTypes/{a1}") public String testSetParameterToInvalidTypes(@Query("p1") int t1, @Path int a1, @Header("h1") int h1) { return "OK"; } @@ -113,7 +115,7 @@ public class ErrorConditionsResource extends RestServletDefault { //==================================================================================================== // Test SC_NOT_FOUND & SC_METHOD_NOT_ALLOWED //==================================================================================================== - @RestMethod(name="GET", path="/test404and405") + @RestMethod(name=GET, path="/test404and405") public String test404and405() { return "OK"; } @@ -121,7 +123,7 @@ public class ErrorConditionsResource extends RestServletDefault { //==================================================================================================== // Test SC_PRECONDITION_FAILED //==================================================================================================== - @RestMethod(name="GET", path="/test412", matchers=NeverMatcher.class) + @RestMethod(name=GET, path="/test412", matchers=NeverMatcher.class) public String test412() { return "OK"; } 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/FormDataResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/FormDataResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/FormDataResource.java index 34936b7..efe3a0a 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/FormDataResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/FormDataResource.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.*; @@ -32,7 +33,7 @@ public class FormDataResource extends RestServletDefault { //==================================================================================================== // Basic tests //==================================================================================================== - @RestMethod(name="POST", path="/*") + @RestMethod(name=POST, path="/*") public Reader test(RestRequest req) throws IOException { return new StringReader("Content-Type=["+req.getContentType()+"], contents=["+read(req.getReader())+"]"); } @@ -41,7 +42,7 @@ public class FormDataResource extends RestServletDefault { // Default values. //==================================================================================================== - @RestMethod(name="POST", path="/defaultFormData", defaultFormData={"f1:1","f2=2"," f3 : 3 "}) + @RestMethod(name=POST, path="/defaultFormData", defaultFormData={"f1:1","f2=2"," f3 : 3 "}) public ObjectMap defaultFormData(RequestFormData formData) { return new ObjectMap() .append("f1", formData.getString("f1")) @@ -49,7 +50,7 @@ public class FormDataResource extends RestServletDefault { .append("f3", formData.getString("f3")); } - @RestMethod(name="POST", path="/annotatedFormData") + @RestMethod(name=POST, path="/annotatedFormData") public ObjectMap annotatedFormData(@FormData("f1") String f1, @FormData("f2") String f2, @FormData("f3") String f3) { return new ObjectMap() .append("f1", f1) @@ -57,7 +58,7 @@ public class FormDataResource extends RestServletDefault { .append("f3", f3); } - @RestMethod(name="POST", path="/annotatedFormDataDefault") + @RestMethod(name=POST, path="/annotatedFormDataDefault") public ObjectMap annotatedFormDataDefault(@FormData(value="f1",def="1") String f1, @FormData(value="f2",def="2") String f2, @FormData(value="f3",def="3") String f3) { return new ObjectMap() .append("f1", f1) @@ -65,7 +66,7 @@ public class FormDataResource extends RestServletDefault { .append("f3", f3); } - @RestMethod(name="POST", path="/annotatedAndDefaultFormData", defaultFormData={"f1:1","f2=2"," f3 : 3 "}) + @RestMethod(name=POST, path="/annotatedAndDefaultFormData", defaultFormData={"f1:1","f2=2"," f3 : 3 "}) public ObjectMap annotatedAndDefaultFormData(@FormData(value="f1",def="4") String f1, @FormData(value="f2",def="5") String f2, @FormData(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/GroupsResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/GroupsResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/GroupsResource.java index 6bd6454..5c84054 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/GroupsResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/GroupsResource.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.HookEvent.*; +import static org.apache.juneau.http.HttpMethodName.*; import org.apache.juneau.*; import org.apache.juneau.parser.*; @@ -75,12 +76,12 @@ public class GroupsResource extends RestServlet { //==================================================================================================== // Serializer defined on class. //==================================================================================================== - @RestMethod(name="GET", path="/testSerializerDefinedOnClass") + @RestMethod(name=GET, path="/testSerializerDefinedOnClass") public String testSerializerDefinedOnClass_get() { - return "GET"; + return GET; } - @RestMethod(name="PUT", path="/testSerializerDefinedOnClass") + @RestMethod(name=PUT, path="/testSerializerDefinedOnClass") public String testSerializerDefinedOnClass_put(@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/GzipResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/GzipResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/GzipResource.java index 2595768..3baee73 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/GzipResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/GzipResource.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.encoders.*; @@ -44,11 +46,11 @@ public class GzipResource { ) public static class TestGzipOff extends RestServlet { private static final long serialVersionUID = 1L; - @RestMethod(name="GET", path="/") + @RestMethod(name=GET, path="/") public String test1get() { return "foo"; } - @RestMethod(name="PUT", path="/") + @RestMethod(name=PUT, path="/") public String test1put(@Body String in) { return in; } @@ -65,17 +67,17 @@ public class GzipResource { ) public static class TestGzipOn extends RestServlet { private static final long serialVersionUID = 1L; - @RestMethod(name="GET", path="/") + @RestMethod(name=GET, path="/") public String test1() { return "foo"; } - @RestMethod(name="PUT", path="/") + @RestMethod(name=PUT, path="/") public String test1put(@Body String in) { return in; } // This method bypasses the content type and encoding from // the serializers and encoders when calling getOutputStream() directly. - @RestMethod(name="GET", path="/direct") + @RestMethod(name=GET, path="/direct") public void direct(RestResponse res) throws Exception { res.setContentType("text/direct"); OutputStream os = res.getOutputStream(); @@ -85,7 +87,7 @@ public class GzipResource { // This method bypasses the content type and encoding from // the serializers and encoders when calling getWriter() directly. - @RestMethod(name="GET", path="/direct2") + @RestMethod(name=GET, path="/direct2") public void direct2(RestResponse res) throws Exception { Writer w = res.getWriter(); w.append("test"); @@ -93,7 +95,7 @@ public class GzipResource { } // This method uses getNegotiatedWriter() which should use GZip encoding. - @RestMethod(name="GET", path="/direct3") + @RestMethod(name=GET, path="/direct3") public void direct3(RestResponse res) throws Exception { Writer w = res.getNegotiatedWriter(); w.append("test"); @@ -101,7 +103,7 @@ public class GzipResource { } // This method overrides the set of encoders at the method level and so shouldn't use GZip encoding. - @RestMethod(name="GET", path="/direct4", inheritEncoders=false) + @RestMethod(name=GET, path="/direct4", inheritEncoders=false) public void direct4(RestResponse res) throws Exception { Writer w = res.getNegotiatedWriter(); w.append("test"); 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/HeadersResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/HeadersResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/HeadersResource.java index 8af0fd3..779eb33 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/HeadersResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/HeadersResource.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.encoders.*; import org.apache.juneau.http.*; @@ -36,115 +38,115 @@ public class HeadersResource extends RestServlet { // HTTP 1.1 headers //==================================================================================================== - @RestMethod(name="GET", path="/accept") + @RestMethod(name=GET, path="/accept") public String accept(Accept accept) { return accept.toString(); } - @RestMethod(name="GET", path="/acceptCharset") + @RestMethod(name=GET, path="/acceptCharset") public String acceptCharset(AcceptCharset acceptCharset) { return acceptCharset.toString(); } - @RestMethod(name="GET", path="/acceptEncoding") + @RestMethod(name=GET, path="/acceptEncoding") public String acceptEncoding(AcceptEncoding acceptEncoding) { return acceptEncoding.toString(); } - @RestMethod(name="GET", path="/acceptLanguage") + @RestMethod(name=GET, path="/acceptLanguage") public String acceptLanguage(AcceptLanguage acceptLanguage) { return acceptLanguage.toString(); } - @RestMethod(name="GET", path="/authorization") + @RestMethod(name=GET, path="/authorization") public String authorization(Authorization authorization) { return authorization.toString(); } - @RestMethod(name="GET", path="/cacheControl") + @RestMethod(name=GET, path="/cacheControl") public String cacheControl(CacheControl cacheControl) { return cacheControl.toString(); } - @RestMethod(name="GET", path="/connection") + @RestMethod(name=GET, path="/connection") public String connection(Connection connection) { return connection.toString(); } - @RestMethod(name="GET", path="/contentLength") + @RestMethod(name=GET, path="/contentLength") public String contentLength(ContentLength contentLength) { return contentLength.toString(); } - @RestMethod(name="GET", path="/contentType") + @RestMethod(name=GET, path="/contentType") public String contentType(ContentType contentType) { return contentType.toString(); } - @RestMethod(name="GET", path="/date") + @RestMethod(name=GET, path="/date") public String date(org.apache.juneau.http.Date date) { return date.toString(); } - @RestMethod(name="GET", path="/expect") + @RestMethod(name=GET, path="/expect") public String expect(Expect expect) { return expect.toString(); } - @RestMethod(name="GET", path="/from") + @RestMethod(name=GET, path="/from") public String from(From from) { return from.toString(); } - @RestMethod(name="GET", path="/host") + @RestMethod(name=GET, path="/host") public String host(Host host) { return host.toString(); } - @RestMethod(name="GET", path="/ifMatch") + @RestMethod(name=GET, path="/ifMatch") public String IfMatch(IfMatch ifMatch) { return ifMatch.toString(); } - @RestMethod(name="GET", path="/ifModifiedSince") + @RestMethod(name=GET, path="/ifModifiedSince") public String ifModifiedSince(IfModifiedSince ifModifiedSince) { return ifModifiedSince.toString(); } - @RestMethod(name="GET", path="/ifNoneMatch") + @RestMethod(name=GET, path="/ifNoneMatch") public String ifNoneMatch(IfNoneMatch ifNoneMatch) { return ifNoneMatch.toString(); } - @RestMethod(name="GET", path="/ifRange") + @RestMethod(name=GET, path="/ifRange") public String ifRange(IfRange ifRange) { return ifRange.toString(); } - @RestMethod(name="GET", path="/ifUnmodifiedSince") + @RestMethod(name=GET, path="/ifUnmodifiedSince") public String ifUnmodifiedSince(IfUnmodifiedSince ifUnmodifiedSince) { return ifUnmodifiedSince.toString(); } - @RestMethod(name="GET", path="/maxForwards") + @RestMethod(name=GET, path="/maxForwards") public String maxForwards(MaxForwards maxForwards) { return maxForwards.toString(); } - @RestMethod(name="GET", path="/pragma") + @RestMethod(name=GET, path="/pragma") public String pragma(Pragma pragma) { return pragma.toString(); } - @RestMethod(name="GET", path="/proxyAuthorization") + @RestMethod(name=GET, path="/proxyAuthorization") public String proxyAuthorization(ProxyAuthorization proxyAuthorization) { return proxyAuthorization.toString(); } - @RestMethod(name="GET", path="/range") + @RestMethod(name=GET, path="/range") public String range(Range range) { return range.toString(); } - @RestMethod(name="GET", path="/referer") + @RestMethod(name=GET, path="/referer") public String referer(Referer referer) { return referer.toString(); } - @RestMethod(name="GET", path="/te") + @RestMethod(name=GET, path="/te") public String te(TE te) { return te.toString(); } - @RestMethod(name="GET", path="/upgrade") + @RestMethod(name=GET, path="/upgrade") public String upgrade(Upgrade upgrade) { return upgrade.toString(); } - @RestMethod(name="GET", path="/userAgent") + @RestMethod(name=GET, path="/userAgent") public String userAgent(UserAgent userAgent) { return userAgent.toString(); } - @RestMethod(name="GET", path="/warning") + @RestMethod(name=GET, path="/warning") public String warning(Warning warning) { return warning.toString(); } - @RestMethod(name="GET", path="/customHeader") + @RestMethod(name=GET, path="/customHeader") public String customHeader(CustomHeader customHeader) { return customHeader.toString(); } @@ -193,7 +195,7 @@ public class HeadersResource extends RestServlet { // Default values. //==================================================================================================== - @RestMethod(name="GET", path="/defaultRequestHeaders", defaultRequestHeaders={"H1:1","H2=2"," H3 : 3 "}) + @RestMethod(name=GET, path="/defaultRequestHeaders", defaultRequestHeaders={"H1:1","H2=2"," H3 : 3 "}) public ObjectMap defaultRequestHeaders(RequestHeaders headers) { return new ObjectMap() .append("h1", headers.getString("H1")) @@ -201,7 +203,7 @@ public class HeadersResource extends RestServlet { .append("h3", headers.getString("H3")); } - @RestMethod(name="GET", path="/defaultRequestHeadersCaseInsensitive", defaultRequestHeaders={"H1:1","H2=2"," H3 : 3 "}) + @RestMethod(name=GET, path="/defaultRequestHeadersCaseInsensitive", defaultRequestHeaders={"H1:1","H2=2"," H3 : 3 "}) public ObjectMap defaultRequestHeadersCaseInsensitive(RequestHeaders headers) { return new ObjectMap() .append("h1", headers.getString("h1")) @@ -209,7 +211,7 @@ public class HeadersResource extends RestServlet { .append("h3", headers.getString("h3")); } - @RestMethod(name="GET", path="/annotatedHeaders") + @RestMethod(name=GET, path="/annotatedHeaders") public ObjectMap annotatedHeaders(@Header("H1") String h1, @Header("H2") String h2, @Header("H3") String h3) { return new ObjectMap() .append("h1", h1) @@ -217,7 +219,7 @@ public class HeadersResource extends RestServlet { .append("h3", h3); } - @RestMethod(name="GET", path="/annotatedHeadersCaseInsensitive") + @RestMethod(name=GET, path="/annotatedHeadersCaseInsensitive") public ObjectMap annotatedHeadersCaseInsensitive(@Header("h1") String h1, @Header("h2") String h2, @Header("h3") String h3) { return new ObjectMap() .append("h1", h1) @@ -225,7 +227,7 @@ public class HeadersResource extends RestServlet { .append("h3", h3); } - @RestMethod(name="GET", path="/annotatedHeadersDefault") + @RestMethod(name=GET, path="/annotatedHeadersDefault") public ObjectMap annotatedHeadersDefault(@Header(value="h1",def="1") String h1, @Header(value="h2",def="2") String h2, @Header(value="h3",def="3") String h3) { return new ObjectMap() .append("h1", h1) @@ -233,7 +235,7 @@ public class HeadersResource extends RestServlet { .append("h3", h3); } - @RestMethod(name="GET", path="/annotatedAndDefaultHeaders", defaultRequestHeaders={"H1:1","H2=2"," H3 : 3 "}) + @RestMethod(name=GET, path="/annotatedAndDefaultHeaders", defaultRequestHeaders={"H1:1","H2=2"," H3 : 3 "}) public ObjectMap annotatedAndDefaultHeaders(@Header(value="h1",def="4") String h1, @Header(value="h2",def="5") String h2, @Header(value="h3",def="6") String h3) { return new ObjectMap() .append("h1", h1) 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/InheritanceResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/InheritanceResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/InheritanceResource.java index 72bb164..7ab8676 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/InheritanceResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/InheritanceResource.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 java.io.*; import java.util.*; @@ -61,7 +62,7 @@ public class InheritanceResource extends RestServlet { // Should show ['text/s3','text/s4','text/s1','text/s2'] @RestMethod( - name="GET", + name=GET, path="/test1" ) public Reader test1(RestResponse res) { @@ -70,7 +71,7 @@ public class InheritanceResource extends RestServlet { // Should show ['text/s5'] @RestMethod( - name="GET", + name=GET, path="/test2", serializers=S5.class ) @@ -80,7 +81,7 @@ public class InheritanceResource extends RestServlet { // Should show ['text/s5','text/s3','text/s4','text/s1','text/s2'] @RestMethod( - name="GET", + name=GET, path="/test3", serializers=S5.class, serializersInherit=SERIALIZERS @@ -99,7 +100,7 @@ public class InheritanceResource extends RestServlet { // Should show ['text/p3','text/p4','text/p1','text/p2'] @RestMethod( - name="GET", + name=GET, path="/test1" ) public Reader test1(RestRequest req) { @@ -108,7 +109,7 @@ public class InheritanceResource extends RestServlet { // Should show ['text/p5'] @RestMethod( - name="GET", + name=GET, path="/test2", parsers=P5.class ) @@ -118,7 +119,7 @@ public class InheritanceResource extends RestServlet { // Should show ['text/p5','text/p3','text/p4','text/p1','text/p2'] @RestMethod( - name="GET", + name=GET, path="/test3", parsers=P5.class, parsersInherit=PARSERS @@ -136,7 +137,7 @@ public class InheritanceResource extends RestServlet { private static final long serialVersionUID = 1L; // Should show ['e3','e4','e1','e2','identity'] - @RestMethod(name="GET", path="/test") + @RestMethod(name=GET, path="/test") public Reader test(RestResponse res) throws RestServletException { return new StringReader(new ObjectList(res.getSupportedEncodings()).toString()); } @@ -150,34 +151,34 @@ public class InheritanceResource extends RestServlet { private static final long serialVersionUID = 1L; // Should show ['F1Swap','F2Swap','Foo3'] - @RestMethod(name="GET", path="/test1") + @RestMethod(name=GET, path="/test1") public Object[] test1() { return new Object[]{new Foo1(), new Foo2(), new Foo3()}; } // Should show ['F1Swap','F2Swap','F3Swap'] // Inherited serializer already has parent filters applied. - @RestMethod(name="GET", path="/test2", pojoSwaps=F3Swap.class) + @RestMethod(name=GET, path="/test2", pojoSwaps=F3Swap.class) public Object[] test2() { return new Object[]{new Foo1(), new Foo2(), new Foo3()}; } // Should show ['F1Swap','F2Swap','F3Swap'] - @RestMethod(name="GET", path="/test3", pojoSwaps=F3Swap.class, serializersInherit=TRANSFORMS) + @RestMethod(name=GET, path="/test3", pojoSwaps=F3Swap.class, serializersInherit=TRANSFORMS) public Object[] test3() { return new Object[]{new Foo1(), new Foo2(), new Foo3()}; } // Should show ['Foo1','Foo2','F3Swap'] // Overriding serializer does not have parent filters applied. - @RestMethod(name="GET", path="/test4", serializers=JsonSerializer.Simple.class, pojoSwaps=F3Swap.class) + @RestMethod(name=GET, path="/test4", serializers=JsonSerializer.Simple.class, pojoSwaps=F3Swap.class) public Object[] test4() { return new Object[]{new Foo1(), new Foo2(), new Foo3()}; } // Should show ['F1Swap','F2Swap','F3Swap'] // Overriding serializer does have parent filters applied. - @RestMethod(name="GET", path="/test5", serializers=JsonSerializer.Simple.class, pojoSwaps=F3Swap.class, serializersInherit=TRANSFORMS) + @RestMethod(name=GET, path="/test5", serializers=JsonSerializer.Simple.class, pojoSwaps=F3Swap.class, serializersInherit=TRANSFORMS) public Object[] test5() { return new Object[]{new Foo1(), new Foo2(), new Foo3()}; } @@ -191,14 +192,14 @@ public class InheritanceResource extends RestServlet { private static final long serialVersionUID = 1L; // Should show {p1:'v1',p2:'v2a',p3:'v3',p4:'v4'} - @RestMethod(name="GET", path="/test1") + @RestMethod(name=GET, path="/test1") public ObjectMap test1(@Properties ObjectMap properties) { return transform(properties); } // Should show {p1:'v1',p2:'v2a',p3:'v3',p4:'v4a',p5:'v5'} when override is false. // Should show {p1:'x',p2:'x',p3:'x',p4:'x',p5:'x'} when override is true. - @RestMethod(name="GET", path="/test2", + @RestMethod(name=GET, path="/test2", properties={@Property(name="p4",value="v4a"), @Property(name="p5", value="v5")}) public ObjectMap test2(@Properties ObjectMap properties, @HasQuery("override") boolean override) { if (override) { 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/InterfaceProxyResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/InterfaceProxyResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/InterfaceProxyResource.java index a964187..aa75846 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/InterfaceProxyResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/InterfaceProxyResource.java @@ -15,6 +15,7 @@ package org.apache.juneau.rest.test; import static java.util.Arrays.*; import static org.apache.juneau.rest.test.TestUtils.*; import static org.junit.Assert.*; +import static org.apache.juneau.http.HttpMethodName.*; import java.util.*; @@ -26,7 +27,7 @@ import org.apache.juneau.utils.*; import org.junit.*; /** - * Tests inteface proxies exposed through <code>@RestMethod(name="PROXY")</code> + * Tests inteface proxies exposed through <code>@RestMethod(name=PROXY)</code> */ @RestResource( path="/testInterfaceProxyResource") @@ -36,7 +37,7 @@ public class InterfaceProxyResource extends ResourceJena { //==================================================================================================== // Test that Q-values are being resolved correctly. //==================================================================================================== - @RestMethod(name="PROXY", path="/proxy/*") + @RestMethod(name=PROXY, path="/proxy/*") public InterfaceProxy getProxy() { return new InterfaceProxy() { 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/LargePojosResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/LargePojosResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/LargePojosResource.java index f31bbb5..1e1759e 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/LargePojosResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/LargePojosResource.java @@ -12,6 +12,8 @@ // *************************************************************************************************************************** package org.apache.juneau.rest.test; +import static org.apache.juneau.http.HttpMethodName.*; + import org.apache.juneau.microservice.*; import org.apache.juneau.rest.annotation.*; @@ -27,12 +29,12 @@ public class LargePojosResource extends ResourceJena { //==================================================================================================== // Test how long it takes to serialize/parse various content types. //==================================================================================================== - @RestMethod(name="GET", path="/") + @RestMethod(name=GET, path="/") public LargePojo testGet() { return LargePojo.create(); } - @RestMethod(name="PUT", path="/") + @RestMethod(name=PUT, path="/") public String testPut(@Body LargePojo in) { return "ok"; } 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/MessagesResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/MessagesResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/MessagesResource.java index 14c4b28..0233944 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/MessagesResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/MessagesResource.java @@ -12,6 +12,8 @@ // *************************************************************************************************************************** package org.apache.juneau.rest.test; +import static org.apache.juneau.http.HttpMethodName.*; + import java.util.*; import org.apache.juneau.*; @@ -37,7 +39,7 @@ public class MessagesResource extends RestServletDefault { //==================================================================================================== // Return contents of resource bundle. //==================================================================================================== - @RestMethod(name="GET", path="/test") + @RestMethod(name=GET, path="/test") public Object test(@Messages ResourceBundle nls) { return nls; } 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/NlsPropertyResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/NlsPropertyResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/NlsPropertyResource.java index 3472634..b731b05 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/NlsPropertyResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/NlsPropertyResource.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.*; @@ -34,7 +36,7 @@ public class NlsPropertyResource extends RestServlet { //==================================================================================================== // Test getting an NLS property defined on a class. //==================================================================================================== - @RestMethod(name="GET", path="/testInheritedFromClass") + @RestMethod(name=GET, path="/testInheritedFromClass") public String testInheritedFromClass() { return null; } @@ -42,7 +44,7 @@ public class NlsPropertyResource extends RestServlet { //==================================================================================================== // Test getting an NLS property defined on a method. //==================================================================================================== - @RestMethod(name="GET", path="/testInheritedFromMethod", + @RestMethod(name=GET, path="/testInheritedFromMethod", properties={ @Property(name="TestProperty",value="$L{key2}") } 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/NlsResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/NlsResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/NlsResource.java index 0048e8e..7fcd80c 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/NlsResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/NlsResource.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.*; @@ -46,7 +48,7 @@ public class NlsResource extends RestServletGroupDefault { public static class Test1 extends RestServletDefault { @RestMethod( - name="POST", path="/{a}", + name=POST, path="/{a}", description="Test1.c", swagger=@MethodSwagger( parameters={ @@ -85,7 +87,7 @@ public class NlsResource extends RestServletGroupDefault { public static class Test2 extends RestServletDefault { @RestMethod( - name="POST", path="/{a}" + name=POST, path="/{a}" ) public String test2(@Path("a") String a, @Query("b") String b, @Body String c, @Header("D") String d, @Path("e") String e, @Query("f") String f, @Header("g") String g) { @@ -103,7 +105,7 @@ public class NlsResource extends RestServletGroupDefault { public static class Test3 extends RestServletDefault { @RestMethod( - name="POST", path="/{a}" + name=POST, path="/{a}" ) public String test3(@Path("a") String a, @Query("b") String b, @Body String c, @Header("D") String d, @Path("e") String e, @Query("f") String f, @Header("g") String g) { @@ -111,7 +113,7 @@ public class NlsResource extends RestServletGroupDefault { } @RestMethod( - name="GET", path="/" + name=GET, path="/" ) public Object test3a(@Messages MessageBundle mb) { return mb; @@ -128,7 +130,7 @@ public class NlsResource extends RestServletGroupDefault { public static class Test4 extends RestServletDefault { @RestMethod( - name="POST", path="/{a}" + name=POST, path="/{a}" ) public String test4(@Path("a") String a, @Query("b") String b, @Body String c, @Header("D") String d, @Path("e") String e, @Query("f") String f, @Header("g") String g) { @@ -146,7 +148,7 @@ public class NlsResource extends RestServletGroupDefault { public static class Test5 extends RestServletDefault { @RestMethod( - name="POST", path="/{a}" + name=POST, path="/{a}" ) public String test5(@Path("a") String a, @Query("b") String b, @Body String c, @Header("D") String d, @Path("e") String e, @Query("f") String f, @Header("g") String g) { @@ -166,7 +168,7 @@ public class NlsResource extends RestServletGroupDefault { public static class Test6 extends RestServletDefault { @RestMethod( - name="POST", path="/{a}", + name=POST, path="/{a}", description="$L{foo}", swagger=@MethodSwagger( parameters={ 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/NoParserInputResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/NoParserInputResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/NoParserInputResource.java index cbd7230..6676015 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/NoParserInputResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/NoParserInputResource.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.*; @@ -33,7 +34,7 @@ public class NoParserInputResource extends RestServlet { //==================================================================================================== // @Body annotated InputStream. //==================================================================================================== - @RestMethod(name="PUT", path="/testInputStream") + @RestMethod(name=PUT, path="/testInputStream") public String testInputStream(@Body InputStream in) throws Exception { return read(in); } @@ -41,7 +42,7 @@ public class NoParserInputResource extends RestServlet { //==================================================================================================== // @Body annotated Reader. //==================================================================================================== - @RestMethod(name="PUT", path="/testReader") + @RestMethod(name=PUT, path="/testReader") public String testReader(@Body Reader in) throws Exception { return read(in); } @@ -50,7 +51,7 @@ public class NoParserInputResource extends RestServlet { // @Body annotated PushbackReader. // This should always fail since the servlet reader is not a pushback reader. //==================================================================================================== - @RestMethod(name="PUT", path="/testPushbackReader") + @RestMethod(name=PUT, path="/testPushbackReader") public String testPushbackReader(@Body PushbackReader in) throws Exception { return read(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/OnPostCallResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/OnPostCallResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/OnPostCallResource.java index a9414b0..0a0426b 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/OnPostCallResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/OnPostCallResource.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.*; @@ -84,7 +85,7 @@ public class OnPostCallResource extends RestServlet { //==================================================================================================== // Test1 - Properties overridden via properties annotation. //==================================================================================================== - @RestMethod(name="PUT", path="/testPropertiesOverridenByAnnotation", + @RestMethod(name=PUT, path="/testPropertiesOverridenByAnnotation", properties={ @Property(name="p3",value="mp3"), @Property(name="p4",value="mp4") @@ -98,7 +99,7 @@ public class OnPostCallResource extends RestServlet { //==================================================================================================== // Test2 - Properties overridden programmatically. //==================================================================================================== - @RestMethod(name="PUT", path="/testPropertiesOverriddenProgramatically") + @RestMethod(name=PUT, path="/testPropertiesOverriddenProgramatically") public String testPropertiesOverriddenProgramatically(RestRequest req, @Properties ObjectMap properties) throws Exception { properties.put("p3", "pp3"); properties.put("p4", "pp4"); 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/OnPreCallResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/OnPreCallResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/OnPreCallResource.java index 9fa9469..15574b4 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/OnPreCallResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/OnPreCallResource.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 org.apache.juneau.*; import org.apache.juneau.parser.*; @@ -73,7 +74,7 @@ public class OnPreCallResource extends RestServlet { //==================================================================================================== // Properties overridden via properties annotation. //==================================================================================================== - @RestMethod(name="PUT", path="/testPropertiesOverriddenByAnnotation", + @RestMethod(name=PUT, path="/testPropertiesOverriddenByAnnotation", properties={ @Property(name="p3",value="mp3"), @Property(name="p4",value="mp4") @@ -86,7 +87,7 @@ public class OnPreCallResource extends RestServlet { //==================================================================================================== // Properties overridden programmatically. //==================================================================================================== - @RestMethod(name="PUT", path="/testPropertiesOverriddenProgrammatically") + @RestMethod(name=PUT, path="/testPropertiesOverriddenProgrammatically") public String testPropertiesOverriddenProgrammatically(RestRequest req, @Properties ObjectMap properties) throws Exception { properties.put("p3", "pp3"); properties.put("p4", "pp4"); 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/OptionsWithoutNlsResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/OptionsWithoutNlsResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/OptionsWithoutNlsResource.java index f31a1b1..df835f0 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/OptionsWithoutNlsResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/OptionsWithoutNlsResource.java @@ -12,6 +12,8 @@ // *************************************************************************************************************************** package org.apache.juneau.rest.test; +import static org.apache.juneau.http.HttpMethodName.*; + import org.apache.juneau.dto.swagger.*; import org.apache.juneau.rest.*; import org.apache.juneau.rest.annotation.*; @@ -28,7 +30,7 @@ public class OptionsWithoutNlsResource extends RestServletDefault { //==================================================================================================== // Should get to the options page without errors //==================================================================================================== - @RestMethod(name="OPTIONS", path="/testOptions/*") + @RestMethod(name=OPTIONS, path="/testOptions/*") public Swagger testOptions(RestRequest req) { return req.getSwagger(); } @@ -36,7 +38,7 @@ public class OptionsWithoutNlsResource extends RestServletDefault { //==================================================================================================== // Missing resource bundle should cause {!!x} string. //==================================================================================================== - @RestMethod(name="GET", path="/testMissingResourceBundle") + @RestMethod(name=GET, path="/testMissingResourceBundle") public String test(RestRequest req) { return req.getMessage("bad", 1, 2, 3); } 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/OverlappingMethodsResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/OverlappingMethodsResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/OverlappingMethodsResource.java index c769089..b3bc725 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/OverlappingMethodsResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/OverlappingMethodsResource.java @@ -12,6 +12,8 @@ // *************************************************************************************************************************** package org.apache.juneau.rest.test; +import static org.apache.juneau.http.HttpMethodName.*; + import org.apache.juneau.plaintext.*; import org.apache.juneau.rest.*; import org.apache.juneau.rest.annotation.*; @@ -29,7 +31,7 @@ public class OverlappingMethodsResource extends RestServletDefault { //==================================================================================================== // Overlapping guards //==================================================================================================== - @RestMethod(name="GET", path="/testOverlappingGuards1", guards=Test1Guard.class) + @RestMethod(name=GET, path="/testOverlappingGuards1", guards=Test1Guard.class) public String testOverlappingGuards1() { return "test1_doGet"; } @@ -37,7 +39,7 @@ public class OverlappingMethodsResource extends RestServletDefault { //==================================================================================================== // Overlapping guards //==================================================================================================== - @RestMethod(name="GET", path="/testOverlappingGuards2", guards={Test1Guard.class, Test2Guard.class}) + @RestMethod(name=GET, path="/testOverlappingGuards2", guards={Test1Guard.class, Test2Guard.class}) public String testOverlappingGuards2() { return "test2_doGet"; } @@ -59,17 +61,17 @@ public class OverlappingMethodsResource extends RestServletDefault { //==================================================================================================== // Overlapping matchers //==================================================================================================== - @RestMethod(name="GET", path="/testOverlappingMatchers1", matchers=Test3aMatcher.class) + @RestMethod(name=GET, path="/testOverlappingMatchers1", matchers=Test3aMatcher.class) public String testOverlappingMatchers1() { return "test3a"; } - @RestMethod(name="GET", path="/testOverlappingMatchers1", matchers=Test3bMatcher.class) + @RestMethod(name=GET, path="/testOverlappingMatchers1", matchers=Test3bMatcher.class) public String test3b_doGet() { return "test3b"; } - @RestMethod(name="GET", path="/testOverlappingMatchers1") + @RestMethod(name=GET, path="/testOverlappingMatchers1") public String test3c_doGet() { return "test3c"; } @@ -91,12 +93,12 @@ public class OverlappingMethodsResource extends RestServletDefault { //==================================================================================================== // Overlapping matchers //==================================================================================================== - @RestMethod(name="GET", path="/testOverlappingMatchers2") + @RestMethod(name=GET, path="/testOverlappingMatchers2") public String test4a_doGet() { return "test4a"; } - @RestMethod(name="GET", path="/testOverlappingMatchers2", matchers={Test3aMatcher.class, Test3bMatcher.class}) + @RestMethod(name=GET, path="/testOverlappingMatchers2", matchers={Test3aMatcher.class, Test3bMatcher.class}) public String test4b_doGet() { return "test4b"; } @@ -104,42 +106,42 @@ public class OverlappingMethodsResource extends RestServletDefault { //==================================================================================================== // Overlapping URL patterns //==================================================================================================== - @RestMethod(name="GET", path="/testOverlappingUrlPatterns") + @RestMethod(name=GET, path="/testOverlappingUrlPatterns") public String testOverlappingUrlPatterns1() { return "test5a"; } - @RestMethod(name="GET", path="/testOverlappingUrlPatterns/*") + @RestMethod(name=GET, path="/testOverlappingUrlPatterns/*") public String testOverlappingUrlPatterns2() { return "test5b"; } - @RestMethod(name="GET", path="/testOverlappingUrlPatterns/foo") + @RestMethod(name=GET, path="/testOverlappingUrlPatterns/foo") public String testOverlappingUrlPatterns3() { return "test5c"; } - @RestMethod(name="GET", path="/testOverlappingUrlPatterns/foo/*") + @RestMethod(name=GET, path="/testOverlappingUrlPatterns/foo/*") public String testOverlappingUrlPatterns4() { return "test5d"; } - @RestMethod(name="GET", path="/testOverlappingUrlPatterns/{id}") + @RestMethod(name=GET, path="/testOverlappingUrlPatterns/{id}") public String testOverlappingUrlPatterns5() { return "test5e"; } - @RestMethod(name="GET", path="/testOverlappingUrlPatterns/{id}/*") + @RestMethod(name=GET, path="/testOverlappingUrlPatterns/{id}/*") public String testOverlappingUrlPatterns6() { return "test5f"; } - @RestMethod(name="GET", path="/testOverlappingUrlPatterns/{id}/foo") + @RestMethod(name=GET, path="/testOverlappingUrlPatterns/{id}/foo") public String testOverlappingUrlPatterns7() { return "test5g"; } - @RestMethod(name="GET", path="/testOverlappingUrlPatterns/{id}/foo/*") + @RestMethod(name=GET, path="/testOverlappingUrlPatterns/{id}/foo/*") public String testOverlappingUrlPatterns8() { return "test5h"; }
