You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2020/11/12 18:27:37 UTC
[juneau] branch master updated: Remove @RestMethod(name)
This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 922010c Remove @RestMethod(name)
922010c is described below
commit 922010c77110e456f5a9b9af4df3ae74de6da8c4
Author: JamesBognar <ja...@salesforce.com>
AuthorDate: Thu Nov 12 13:27:26 2020 -0500
Remove @RestMethod(name)
---
.../org/apache/juneau/http/remote/Remote_Test.java | 6 +-
.../juneau/http/remote/RrpcInterfaceTest.java | 2 +-
.../org/apache/juneau/dto/jsonschema/package.html | 6 +-
.../org/apache/juneau/http/annotation/Body.java | 22 +-
.../apache/juneau/http/annotation/FormData.java | 4 +-
.../org/apache/juneau/http/annotation/Header.java | 4 +-
.../org/apache/juneau/http/annotation/Path.java | 10 +-
.../org/apache/juneau/http/annotation/Query.java | 4 +-
.../java/org/apache/juneau/http/remote/Remote.java | 6 +-
.../juneau/jsonschema/annotation/Schema.java | 16 +-
juneau-doc/docs/ReleaseNotes/9.0.0.html | 2 +
.../docs/Topics/04.juneau-dto/04.DtoSwaggerUi.html | 2 +-
.../01.RestHelloWorldExample.html | 2 +-
.../03.RestInstantiation/02.BasicRestServlet.html | 2 +-
.../03.RestInstantiation/03.BasicRest.html | 2 +-
.../05.BasicRestServletGroup.html | 2 +-
.../03.RestInstantiation/06.BasicRestGroup.html | 2 +-
.../06.juneau-rest-server/06.RestMethod.html | 2 +-
.../06.RestMethod/01.RestmParameters.html | 4 +-
.../06.RestMethod/09.RestmPath.html | 20 +-
.../06.RestMethod/11.RestmReturnTypes.html | 8 +-
.../06.RestMethod/14.RestmMatchers.html | 4 +-
.../06.RestMethod/15.RestmPredefinedResponses.html | 6 +-
.../16.RestmPredefinedExceptions.html | 2 +-
.../17.RestmPredefinedHelperBeans.html | 12 +-
.../Topics/06.juneau-rest-server/07.RestRpc.html | 8 +-
.../01.RestBodyAnnotation.html | 6 +-
.../02.RestFormDataAnnotation.html | 10 +-
.../03.RestHasFormDataAnnotation.html | 4 +-
.../04.RestQueryAnnotation.html | 10 +-
.../05.RestHasQueryAnnotation.html | 4 +-
.../06.RestHeaderAnnotation.html | 10 +-
.../07.RestPathAnnotation.html | 10 +-
.../09.RestResponseAnnotation.html | 12 +-
.../11.RestResponseStatusAnnotation.html | 2 +-
.../11.RestHandlingFormPosts.html | 4 +-
.../12.RestHandlingMultiPartFormPosts.html | 2 +-
.../15.RestConfigurableProperties.html | 2 +-
.../06.juneau-rest-server/19.RestGuards.html | 4 +-
.../06.juneau-rest-server/22.RestMessages.html | 2 +-
.../25.RestConfigurationFiles.html | 4 +-
.../27.RestClientVersioning.html | 6 +-
.../01.RestSwaggerBasicRestServlet.html | 2 +-
.../29.RestSwagger/03.RestSwaggerTags.html | 2 +-
.../29.RestSwagger/04.RestSwaggerOperations.html | 4 +-
.../29.RestSwagger/05.RestSwaggerParameters.html | 2 +-
.../06.RestSwaggerParameterExamples.html | 2 +-
.../29.RestSwagger/07.RestSwaggerResponses.html | 2 +-
.../08.RestSwaggerResponseExamples.html | 2 +-
.../29.RestSwagger/09.RestSwaggerModels.html | 2 +-
.../02.RestHtmlWidgets.html | 18 +-
.../03.RestHtmlPredefinedWidgets.html | 7 +-
.../35.RestOverloadingHttpMethods.html | 2 +-
.../37.RestCustomSerializersAndParsers.html | 12 +-
.../10.RestcDualPurposeInterfaces.html | 4 +-
.../10.juneau-rest-mock/01.MockRestClient.html | 2 +-
.../03.MicroserviceJettyResourceClasses.html | 2 +-
.../05.MicroserviceJettyConfig.html | 4 +-
.../02.RestExamplesHelloWorldResource.html | 2 +-
.../03.RestExamplesDtoExamples.html | 8 +-
.../04.RestExamplesConfigResource.html | 16 +-
.../juneau/examples/rest/HelloWorldResource.java | 2 +-
.../juneau/examples/rest/RequestEchoResource.java | 2 +-
.../microservice/resources/ConfigResource.java | 16 +-
.../microservice/resources/DirectoryResource.java | 10 +-
.../microservice/resources/LogsResource.java | 10 +-
.../microservice/resources/ShutdownResource.java | 2 +-
.../apache/juneau/rest/test/ConfigResource.java | 4 +-
.../juneau/rest/test/LargePojosResource.java | 4 +-
.../java/org/apache/juneau/rest/test/Root.java | 2 +-
.../rest/test/client/ThirdPartyProxyResource.java | 310 ++++++++++-----------
.../jetty/resources/DebugResource.java | 6 +-
.../rest/client/RestClient_BasicCalls_Test.java | 2 +-
.../client/RestClient_CallbackStrings_Test.java | 4 +-
.../apache/juneau/rest/mock/MockRestClient.java | 4 +-
.../juneau/rest/Header_AcceptCharset_Test.java | 2 +-
.../juneau/rest/Header_ContentType_Test.java | 10 +-
.../java/org/apache/juneau/rest/Paths_Test.java | 8 +-
.../apache/juneau/rest/RestMethod_Params_Test.java | 6 +-
.../rest/Rest_PredefinedStatusCodes_Test.java | 20 +-
.../java/org/apache/juneau/rest/Swagger_Test.java | 192 ++++++-------
.../rest/annotation/BeanConfig_Swaps_Test.java | 8 +-
.../apache/juneau/rest/annotation/Body_Test.java | 86 +++---
.../juneau/rest/annotation/FormData_Test.java | 20 +-
.../juneau/rest/annotation/HasQuery_Test.java | 2 +-
.../juneau/rest/annotation/PathRemainder_Test.java | 10 +-
.../apache/juneau/rest/annotation/Path_Test.java | 74 ++---
.../apache/juneau/rest/annotation/Query_Test.java | 4 +-
.../juneau/rest/annotation/RestHook_Test.java | 8 +-
.../rest/annotation/RestMethodAnnotation_Test.java | 5 -
.../annotation/RestMethod_ClientVersion_Test.java | 20 +-
.../rest/annotation/RestMethod_Matchers_Test.java | 10 +-
.../annotation/Rest_AllowedMethodHeaders_Test.java | 2 +-
.../annotation/Rest_AllowedMethodParams_Test.java | 2 +-
.../Rest_AnnotationInheritance_Test.java | 6 +-
.../juneau/rest/annotation/Rest_RVars_Test.java | 2 +-
.../juneau/rest/annotation/Restx_Parsers_Test.java | 10 +-
.../juneau/rest/annotation/Swagger_Path_Test.java | 44 +--
.../org/apache/juneau/rest/BasicRestGroup.java | 2 +-
.../org/apache/juneau/rest/BasicRestMethods.java | 8 +-
.../apache/juneau/rest/BasicRestServletGroup.java | 2 +-
.../java/org/apache/juneau/rest/RequestPath.java | 2 +-
.../org/apache/juneau/rest/ResponseHandler.java | 2 +-
.../java/org/apache/juneau/rest/RestContext.java | 12 +-
.../java/org/apache/juneau/rest/RestConverter.java | 2 +-
.../java/org/apache/juneau/rest/RestGuard.java | 2 +-
.../java/org/apache/juneau/rest/RestMatcher.java | 4 +-
.../org/apache/juneau/rest/RestMethodContext.java | 19 +-
.../java/org/apache/juneau/rest/RestResponse.java | 2 +-
.../org/apache/juneau/rest/annotation/Attr.java | 4 +-
.../org/apache/juneau/rest/annotation/Method.java | 4 +-
.../juneau/rest/annotation/MethodSwagger.java | 10 +-
.../apache/juneau/rest/annotation/RestMethod.java | 47 ++--
.../rest/annotation/RestMethodAnnotation.java | 24 +-
.../apache/juneau/rest/converters/Traversable.java | 2 +-
.../org/apache/juneau/rest/remote/RrpcServlet.java | 8 +-
.../juneau/rest/widget/ContentTypeMenuItem.java | 2 +-
.../server/config/rest/LoadConfigResource.java | 2 +-
118 files changed, 703 insertions(+), 733 deletions(-)
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
index 3ce04e1..3876a94 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
@@ -404,7 +404,7 @@ public class Remote_Test {
@Rest
public static class E implements BasicSimpleJsonRest {
- @RestMethod(name=HttpMethod.RRPC)
+ @RestMethod(method=HttpMethod.RRPC)
public E1 getProxy() {
return new E1() {
@Override
@@ -456,7 +456,7 @@ public class Remote_Test {
@Rest
public static class E5 implements BasicSimpleJsonRest {
- @RestMethod(name=HttpMethod.RRPC)
+ @RestMethod(method=HttpMethod.RRPC)
public E5b getProxy() {
return new E5b() {
@Override
@@ -486,7 +486,7 @@ public class Remote_Test {
@Rest
public static class E6 implements BasicSimpleJsonRest {
- @RestMethod(name=HttpMethod.RRPC)
+ @RestMethod(method=HttpMethod.RRPC)
public E5b getProxy() {
return new E5b() {
@Override
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/http/remote/RrpcInterfaceTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/http/remote/RrpcInterfaceTest.java
index 5f86d03..6fd8d63 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/http/remote/RrpcInterfaceTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/http/remote/RrpcInterfaceTest.java
@@ -240,7 +240,7 @@ public class RrpcInterfaceTest {
//-----------------------------------------------------------------------------------------------------------------
// Test that Q-values are being resolved correctly.
//-----------------------------------------------------------------------------------------------------------------
- @RestMethod(name=RRPC,path="/proxy/*")
+ @RestMethod(method=RRPC,path="/proxy/*")
public InterfaceProxy getProxy() {
return new InterfaceProxy() {
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/package.html b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/package.html
index 2b28860..dde8f9e 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/package.html
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/package.html
@@ -456,7 +456,7 @@
}
<jd>/** GET request handler */</jd>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/"</js>)
<jk>public</jk> JsonSchema getSchema() <jk>throws</jk> Exception {
<jk>return</jk> <jf>schema</jf>;
}
@@ -465,14 +465,14 @@
* PUT request handler.
* Replaces the schema document with the specified content, and then mirrors it as the response.
*/</jd>
- <ja>@RestMethod</ja>(name=<jsf>PUT</jsf>, path=<js>"/"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>PUT</jsf>, path=<js>"/"</js>)
<jk>public</jk> JsonSchema setSchema(<ja>@Body</ja> JsonSchema schema) <jk>throws</jk> Exception {
<jk>this</jk>.<jf>schema</jf> = schema;
<jk>return</jk> <jk>this</jk>.<jf>schema</jf>;
}
<jd>/** OPTIONS request handler */</jd>
- <ja>@RestMethod</ja>(name=<jsf>OPTIONS</jsf>, path=<js>"/*"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>OPTIONS</jsf>, path=<js>"/*"</js>)
<jk>public</jk> ResourceOptions doOptions(RestRequest req) {
<jk>return new</jk> ResourceOptions(<jk>this</jk>, req);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
index fe42109..0ff535b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
@@ -45,12 +45,12 @@ import org.apache.juneau.jsonschema.*;
* <h5 class='section'>Examples:</h5>
* <p class='bcode w800'>
* <jc>// Used on parameter</jc>
- * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>,path=<js>"/pets"</js>)
+ * <ja>@RestMethod</ja>(method=<jsf>POST</jsf>,path=<js>"/pets"</js>)
* <jk>public void</jk> addPet(<ja>@Body</ja> Pet pet) {...}
* </p>
* <p class='bcode w800'>
* <jc>// Used on class</jc>
- * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>,path=<js>"/pets"</js>)
+ * <ja>@RestMethod</ja>(method=<jsf>POST</jsf>,path=<js>"/pets"</js>)
* <jk>public void</jk> addPet(Pet pet) {...}
*
* <ja>@Body</ja>
@@ -60,7 +60,7 @@ import org.apache.juneau.jsonschema.*;
* <p>
* This is functionally equivalent to the following code...
* <p class='bcode w800'>
- * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>,path=<js>"/pets"</js>)
+ * <ja>@RestMethod</ja>(method=<jsf>POST</jsf>,path=<js>"/pets"</js>)
* <jk>public void</jk> addPet(RestRequest req) {
* Pet pet = req.getBody().asType(Pet.<jk>class</jk>);
* ...
@@ -72,7 +72,7 @@ import org.apache.juneau.jsonschema.*;
*
* <h5 class='section'>Examples:</h5>
* <p class='bcode w800'>
- * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>,path=<js>"/pets"</js>)
+ * <ja>@RestMethod</ja>(method=<jsf>POST</jsf>,path=<js>"/pets"</js>)
* <jk>public void</jk> addPet(Pet pet) {...}
*
* <ja>@Body</ja>(
@@ -184,14 +184,14 @@ public @interface Body {
* <h5 class='section'>Examples:</h5>
* <p class='bcode w800'>
* <jc>// Used on parameter</jc>
- * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
+ * <ja>@RestMethod</ja>(method=<jsf>POST</jsf>)
* <jk>public void</jk> addPet(
* <ja>@Body</ja>(description=<js>"Pet object to add to the store"</js>) Pet input
* ) {...}
* </p>
* <p class='bcode w800'>
* <jc>// Used on class</jc>
- * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
+ * <ja>@RestMethod</ja>(method=<jsf>POST</jsf>)
* <jk>public void</jk> addPet(Pet input) {...}
*
* <ja>@Body</ja>(description=<js>"Pet object to add to the store"</js>)
@@ -424,14 +424,14 @@ public @interface Body {
* <h5 class='section'>Examples:</h5>
* <p class='bcode w800'>
* <jc>// Used on parameter</jc>
- * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
+ * <ja>@RestMethod</ja>(method=<jsf>POST</jsf>)
* <jk>public void</jk> addPet(
* <ja>@Body</ja>(required=<jk>true</jk>) Pet input
* ) {...}
* </p>
* <p class='bcode w800'>
* <jc>// Used on class</jc>
- * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
+ * <ja>@RestMethod</ja>(method=<jsf>POST</jsf>)
* <jk>public void</jk> addPet(Pet input) {...}
*
* <ja>@Body</ja>(required=<jk>true</jk>)
@@ -494,7 +494,7 @@ public @interface Body {
* The following are completely equivalent ways of defining the swagger description of the body:
* <p class='bcode w800'>
* <jc>// Normal</jc>
- * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
+ * <ja>@RestMethod</ja>(method=<jsf>POST</jsf>)
* <jk>public void</jk> addPet(
* <ja>@Body</ja>(
* description=<js>"Pet object to add to the store"</js>,
@@ -505,7 +505,7 @@ public @interface Body {
* </p>
* <p class='bcode w800'>
* <jc>// Free-form</jc>
- * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
+ * <ja>@RestMethod</ja>(method=<jsf>POST</jsf>)
* <jk>public void</jk> addPet(
* <ja>@Body</ja>({
* <js>"description: 'Pet object to add to the store',"</js>,
@@ -516,7 +516,7 @@ public @interface Body {
* </p>
* <p class='bcode w800'>
* <jc>// Free-form with variables</jc>
- * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
+ * <ja>@RestMethod</ja>(method=<jsf>POST</jsf>)
* <jk>public void</jk> addPet(
* <ja>@Body</ja>(<js>"$L{petObjectSwagger}"</js>) Pet input
* ) {...}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java
index 86644c1..3aeffa3 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java
@@ -46,7 +46,7 @@ import org.apache.juneau.oapi.*;
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
+ * <ja>@RestMethod</ja>(method=<jsf>POST</jsf>)
* <jk>public void</jk> doPost(
* <ja>@FormData</ja>(<js>"p1"</js>) <jk>int</jk> p1,
* <ja>@FormData</ja>(<js>"p2"</js>) String p2,
@@ -57,7 +57,7 @@ import org.apache.juneau.oapi.*;
* <p>
* This is functionally equivalent to the following code...
* <p class='bcode w800'>
- * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
+ * <ja>@RestMethod</ja>(method=<jsf>POST</jsf>)
* <jk>public void</jk> doPost(RestRequest req) {
* <jk>int</jk> p1 = req.getFormData(<jk>int</jk>.<jk>class</jk>, <js>"p1"</js>, 0);
* String p2 = req.getFormData(String.<jk>class</jk>, <js>"p2"</js>);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java
index f4f6370..5c30cd4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java
@@ -47,14 +47,14 @@ import org.apache.juneau.oapi.*;
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>)
* <jk>public void</jk> doGet(<ja>@Header</ja>(<js>"ETag"</js>) UUID etag) {...}
* </p>
*
* <p>
* This is functionally equivalent to the following code...
* <p class='bcode w800'>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>)
* <jk>public void</jk> doPostPerson(RestRequest req, RestResponse res) {
* UUID etag = req.getHeader(UUID.<jk>class</jk>, <js>"ETag"</js>);
* ...
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
index 0b770ac..9979a29 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
@@ -47,7 +47,7 @@ import org.apache.juneau.oapi.*;
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/myurl/{foo}/{bar}/{baz}/*"</js>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/myurl/{foo}/{bar}/{baz}/*"</js>)
* <jk>public void</jk> doGet(
* <ja>@Path</ja>(<js>"foo"</js>) String foo,
* <ja>@Path</ja>(<js>"bar"</js>) <jk>int</jk> bar,
@@ -106,7 +106,7 @@ public @interface Path {
* <h5 class='section'>Examples:</h5>
* <p class='bcode w800'>
* <jc>// Comma-delimited list</jc>
- * <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/pet/findByStatus/{status}"</js>)
+ * <ja>@RestMethod</ja>(method=<js>"GET"</js>, path=<js>"/pet/findByStatus/{status}"</js>)
* <jk>public</jk> Collection<Pet> findPetsByStatus(
* <ja>@Path</ja>(
* name=<js>"status"</js>,
@@ -116,7 +116,7 @@ public @interface Path {
* </p>
* <p class='bcode w800'>
* <jc>// JSON array</jc>
- * <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/pet/findByStatus/{status}"</js>)
+ * <ja>@RestMethod</ja>(method=<js>"GET"</js>, path=<js>"/pet/findByStatus/{status}"</js>)
* <jk>public</jk> Collection<Pet> findPetsByStatus(
* <ja>@Path</ja>(
* name=<js>"status"</js>,
@@ -1067,14 +1067,14 @@ public @interface Path {
* The following are completely equivalent ways of defining a path entry:
* <p class='bcode w800'>
* <ja>@RestMethod</ja>(
- * name=<js>"GET"</js>,
+ * method=<js>"GET"</js>,
* path=<js>"/pet/{petId}"</js>
* )
* <jk>public</jk> Pet getPet(<ja>@Path</ja>(name=<js>"petId"</js>) <jk>long</jk> petId) { ... }
* </p>
* <p class='bcode w800'>
* <ja>@RestMethod</ja>(
- * name=<js>"GET"</js>,
+ * method=<js>"GET"</js>,
* path=<js>"/pet/{petId}"</js>
* )
* <jk>public</jk> Pet getPet(<ja>@Path</ja>(<js>"petId"</js>) <jk>long</jk> petId) { ... }
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java
index 7e91d82..58a8ac6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java
@@ -52,7 +52,7 @@ import org.apache.juneau.oapi.*;
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>)
* <jk>public void</jk> doGet(
* <ja>@Query</ja>(<js>"p1"</js>) <jk>int</jk> p1,
* <ja>@Query</ja>(<js>"p2"</js>) String p2,
@@ -63,7 +63,7 @@ import org.apache.juneau.oapi.*;
* <p>
* This is functionally equivalent to the following code...
* <p class='bcode w800'>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>)
* <jk>public void</jk> doGet(RestRequest req, RestResponse res) {
* <jk>int</jk> p1 = req.getQueryParameter(<jk>int</jk>.<jk>class</jk>, <js>"p1"</js>, 0);
* String p2 = req.getQueryParameter(String.<jk>class</jk>, <js>"p2"</js>);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/Remote.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/Remote.java
index a4c0300..dd80a5f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/Remote.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/Remote.java
@@ -93,15 +93,15 @@ public @interface Remote {
* <p class='bcode w800'>
* <jc>// Call this method if X-Client-Version is at least 2.0.
* // Note that this also matches 2.0.1.</jc>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"2.0"</js>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"2.0"</js>)
* <jk>public</jk> Object method1() {...}
*
* <jc>// Call this method if X-Client-Version is at least 1.1, but less than 2.0.</jc>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"[1.1,2.0)"</js>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"[1.1,2.0)"</js>)
* <jk>public</jk> Object method2() {...}
*
* <jc>// Call this method if X-Client-Version is less than 1.1.</jc>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"[0,1.1)"</js>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"[0,1.1)"</js>)
* <jk>public</jk> Object method3() {...}
* </p>
*
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Schema.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Schema.java
index dfc2a71..3b63d61 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Schema.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Schema.java
@@ -217,14 +217,14 @@ public @interface Schema {
* <h5 class='section'>Examples:</h5>
* <p class='bcode w800'>
* <jc>// Used on parameter</jc>
- * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
+ * <ja>@RestMethod</ja>(method=<jsf>POST</jsf>)
* <jk>public void</jk> addPet(
* <ja>@Body</ja>(description=<js>"Pet object to add to the store"</js>) Pet input
* ) {...}
* </p>
* <p class='bcode w800'>
* <jc>// Used on class</jc>
- * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
+ * <ja>@RestMethod</ja>(method=<jsf>POST</jsf>)
* <jk>public void</jk> addPet(Pet input) {...}
*
* <ja>@Body</ja>(description=<js>"Pet object to add to the store"</js>)
@@ -375,7 +375,7 @@ public @interface Schema {
* <h5 class='section'>Examples:</h5>
* <p class='bcode w800'>
* <jc>// Used on parameter</jc>
- * <ja>@RestMethod</ja>(name=<jsf>PUT</jsf>)
+ * <ja>@RestMethod</ja>(method=<jsf>PUT</jsf>)
* <jk>public void</jk> setAge(
* <ja>@Body</ja>(type=<js>"integer"</js>, format=<js>"int32"</js>) String input
* ) {...}
@@ -685,7 +685,7 @@ public @interface Schema {
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestMethod</ja>(name=<jsf>PUT</jsf>)
+ * <ja>@RestMethod</ja>(method=<jsf>PUT</jsf>)
* <jk>public void</jk> doPut(<ja>@Body</ja>(format=<js>"/\\w+\\.\\d+/"</js>) String input) {...}
* </p>
*
@@ -744,14 +744,14 @@ public @interface Schema {
* <h5 class='section'>Examples:</h5>
* <p class='bcode w800'>
* <jc>// Used on parameter</jc>
- * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
+ * <ja>@RestMethod</ja>(method=<jsf>POST</jsf>)
* <jk>public void</jk> addPet(
* <ja>@Body</ja>(required=<jk>true</jk>) Pet input
* ) {...}
* </p>
* <p class='bcode w800'>
* <jc>// Used on class</jc>
- * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
+ * <ja>@RestMethod</ja>(method=<jsf>POST</jsf>)
* <jk>public void</jk> addPet(Pet input) {...}
*
* <ja>@Body</ja>(required=<jk>true</jk>)
@@ -797,14 +797,14 @@ public @interface Schema {
* <h5 class='section'>Examples:</h5>
* <p class='bcode w800'>
* <jc>// Used on parameter</jc>
- * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
+ * <ja>@RestMethod</ja>(method=<jsf>POST</jsf>)
* <jk>public void</jk> addPet(
* <ja>@Body</ja>(type=<js>"object"</js>) Pet input
* ) {...}
* </p>
* <p class='bcode w800'>
* <jc>// Used on class</jc>
- * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
+ * <ja>@RestMethod</ja>(method=<jsf>POST</jsf>)
* <jk>public void</jk> addPet(Pet input) {...}
*
* <ja>@Body</ja>(type=<js>"object"</js>)
diff --git a/juneau-doc/docs/ReleaseNotes/9.0.0.html b/juneau-doc/docs/ReleaseNotes/9.0.0.html
index e4dcaed..30a3eff 100644
--- a/juneau-doc/docs/ReleaseNotes/9.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/9.0.0.html
@@ -46,6 +46,8 @@ Juneau 9.0.0 is a major release.
<ul class='spaced-list'>
<li>
Removed deprecated APIs.
+ <li>
+ Removed the <c><ja>@RestMethod</ja>(name)</c> annotation. Use <c><ja>@RestMethod</ja>(method)</c> instead.
</ul>
<h5 class='topic w800'>juneau-rest-server-springboot</h5>
diff --git a/juneau-doc/docs/Topics/04.juneau-dto/04.DtoSwaggerUi.html b/juneau-doc/docs/Topics/04.juneau-dto/04.DtoSwaggerUi.html
index 2db2b5e..5587984 100644
--- a/juneau-doc/docs/Topics/04.juneau-dto/04.DtoSwaggerUi.html
+++ b/juneau-doc/docs/Topics/04.juneau-dto/04.DtoSwaggerUi.html
@@ -74,7 +74,7 @@ Swagger UI
* [OPTIONS /*] - Show resource options.
*/</jd>
<ja>@RestMethod</ja>(
- name=<jsf>OPTIONS</jsf>,
+ method=<jsf>OPTIONS</jsf>,
path=<js>"/*"</js>,
summary=<js>"Swagger documentation"</js>,
description=<js>"Swagger documentation for this resource."</js>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/01.RestHelloWorldExample.html b/juneau-doc/docs/Topics/06.juneau-rest-server/01.RestHelloWorldExample.html
index 523945c..e35bb03 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/01.RestHelloWorldExample.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/01.RestHelloWorldExample.html
@@ -65,7 +65,7 @@ Hello World Example
)
<jk>public class</jk> HelloWorldResource <jk>extends</jk> BasicUniversalRest {
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/*"</js>, summary=<js>"Responds with \"Hello world!\""</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/*"</js>, summary=<js>"Responds with \"Hello world!\""</js>)
<jk>public</jk> String sayHello() {
<jk>return</jk> <js>"Hello world!"</js>;
}
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/02.BasicRestServlet.html b/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/02.BasicRestServlet.html
index e5ecbd2..0d713c7 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/02.BasicRestServlet.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/02.BasicRestServlet.html
@@ -55,7 +55,7 @@ BasicRestServlet
* <ja>@param</ja> req The HTTP request.
* <ja>@return</ja> A bean containing the contents for the OPTIONS page.
*/</jd>
- <ja>@RestMethod</ja>(name=<jsf>OPTIONS</jsf>, path=<js>"/*"</js>,
+ <ja>@RestMethod</ja>(method=<jsf>OPTIONS</jsf>, path=<js>"/*"</js>,
summary=<js>"Swagger documentation"</js>,
description=<js>"Swagger documentation for this resource."</js>,
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/03.BasicRest.html b/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/03.BasicRest.html
index 86508ad..81b7463 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/03.BasicRest.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/03.BasicRest.html
@@ -49,7 +49,7 @@ BasicRest
* <ja>@param</ja> req The HTTP request.
* <ja>@return</ja> A bean containing the contents for the OPTIONS page.
*/</jd>
- <ja>@RestMethod</ja>(name=<jsf>OPTIONS</jsf>, path=<js>"/*"</js>,
+ <ja>@RestMethod</ja>(method=<jsf>OPTIONS</jsf>, path=<js>"/*"</js>,
summary=<js>"Swagger documentation"</js>,
description=<js>"Swagger documentation for this resource."</js>,
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/05.BasicRestServletGroup.html b/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/05.BasicRestServletGroup.html
index b78427f..4ef51b9 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/05.BasicRestServletGroup.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/05.BasicRestServletGroup.html
@@ -63,7 +63,7 @@ BasicRestServletGroup
<jk>public class</jk> BasicRestServletGroup <jk>extends</jk> BasicRestServlet {
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/"</js>, description=<js>"Child resources"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/"</js>, description=<js>"Child resources"</js>)
<jk>public</jk> ChildResourceDescriptions getChildren(RestRequest req) {
<jk>return new</jk> ChildResourceDescriptions(<jk>this</jk>, req);
}
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/06.BasicRestGroup.html b/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/06.BasicRestGroup.html
index d3e6536..3faa164 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/06.BasicRestGroup.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/06.BasicRestGroup.html
@@ -28,7 +28,7 @@ BasicRestGroup
<jk>public class</jk> BasicRestGroup <jk>extends</jk> BasicRest {
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/"</js>, description=<js>"Child resources"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/"</js>, description=<js>"Child resources"</js>)
<jk>public</jk> ChildResourceDescriptions getChildren(RestRequest req) {
<jk>return new</jk> ChildResourceDescriptions(<jk>this</jk>, req);
}
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod.html b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod.html
index 449e7c7..54d3b91 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod.html
@@ -22,7 +22,7 @@
</p>
<h5 class='figure'>Example:</h5>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/"</js>)
<jk>public</jk> String sayHello() {
<jk>return</jk> <js>"Hello world!"</js>;
}
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/01.RestmParameters.html b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/01.RestmParameters.html
index d680075..98d391d 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/01.RestmParameters.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/01.RestmParameters.html
@@ -86,7 +86,7 @@ Java Method Parameters
</ul>
<li><b>Other:</b>
<ul>
- <li class='jc'>{@link oaj.http.HttpMethod} - The method name matched (when using <c><ja>@RestMethod</ja>(name=<js>"*"</js>)</c>)
+ <li class='jc'>{@link oaj.http.HttpMethod} - The method name matched (when using <c><ja>@RestMethod</ja>(method=<js>"*"</js>)</c>)
<li class='jc'>{@link oajr.RestLogger} - Logger with additional features.
<li class='jc'>{@link oajr.RestContext} - The resource read-only context.
<li class='jc'>{@link oaj.parser.Parser} - The parser matching the request content type.
@@ -115,7 +115,7 @@ Java Method Parameters
</ul>
<h5 class='figure'>Example:</h5>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/example1/{a1}/{a2}/{a3}/*"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/example1/{a1}/{a2}/{a3}/*"</js>)
<jk>public</jk> String doGetExample1(
RestRequest req,
RestResponse res,
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/09.RestmPath.html b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/09.RestmPath.html
index 8e0bf00..601da23 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/09.RestmPath.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/09.RestmPath.html
@@ -28,19 +28,19 @@
</p>
<p class='bpcode w800'>
<jc>// Default method</jc>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/*"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/*"</js>)
<jk>public void</jk> doGetDefault() {
...
}
<jc>// Method with path pattern</jc>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/xxx"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/xxx"</js>)
<jk>public void</jk> doGetNoArgs(...) {
...
}
<jc>// Method with path pattern with arguments</jc>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/xxx/{foo}/{bar}/{baz}/{bing}"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/xxx/{foo}/{bar}/{baz}/{bing}"</js>)
<jk>public void</jk> doGetWithArgs(<ja>@Path</ja>(<js>"foo"</js>) String foo, <ja>@Path</ja>(<js>"bar"</js>) <jk>int</jk> bar, <ja>@Path</ja>(<js>"baz"</js>) MyEnum baz, <ja>@Path</ja>(<js>"bing"</js>) UUID bing) {
...
}
@@ -51,25 +51,25 @@
</p>
<p class='bpcode w800'>
<jc>// Try first </jc>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foo/bar"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/foo/bar"</js>)
<jk>public void</jk> method1() {
...
}
<jc>// Try second</jc>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foo/{bar}"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/foo/{bar}"</js>)
<jk>public void</jk> method2(...) {
...
}
<jc>// Try third</jc>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foo/*"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/foo/*"</js>)
<jk>public void</jk> method3(...) {
...
}
<jc>// Try last</jc>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/*"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/*"</js>)
<jk>public void</jk> method4(...) {
...
}
@@ -92,12 +92,12 @@
The following example shows the distinction.
</p>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/*"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/*"</js>)
<jk>public void</jk> doGet(<ja>@Path</ja>(<js>"/*"</js>) String remainder) {
<jc>// URL path pattern can have remainder accessible through req.getRemainder().</jc>
}
- <ja>@RestMethod</ja>(name=<jsf>PUT</jsf>, path=<js>"/"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>PUT</jsf>, path=<js>"/"</js>)
<jk>public void</jk> doPut() {
<jc>// URL path pattern must match exactly and will cause a 404 error if a remainder exists.</jc>
}
@@ -108,7 +108,7 @@
</p>
<p class='bpcode w800'>
<jc>// Example GET request with access to query parameters</jc>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/urlWithParams"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/urlWithParams"</js>)
<jk>public</jk> String doGetWithParams(<ja>@Query</ja>(<js>"foo"</js>) String foo, <ja>@Query</ja>(<js>"bar"</js>) <jk>int</jk> bar, <ja>@Query</ja>(<js>"baz"</js>) UUID baz) <jk>throws</jk> Exception {
<jk>return</jk> <js>"GET /urlWithParams?foo="</js>+foo+<js>"&bar="</js>+bar+<js>"&baz="</js>+baz;
}
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/11.RestmReturnTypes.html b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/11.RestmReturnTypes.html
index 125bf35..887fa39 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/11.RestmReturnTypes.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/11.RestmReturnTypes.html
@@ -22,7 +22,7 @@ Method Return Types
</p>
<h5 class='figure'>Example:</h5>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>)
<jk>public</jk> String doGet() {
<jk>return</jk> <js>"Hello World!"</js>;
}
@@ -76,14 +76,14 @@ Method Return Types
<h5 class='figure'>Example:</h5>
<p class='bpcode w800'>
<jc>// Equivalent method 1</jc>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/example1/{personId}"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/example1/{personId}"</js>)
<jk>public</jk> Person doGet1(<ja>@Path</ja>(<js>"personId"</js>) UUID personId) {
Person p = getPersonById(personId);
<jk>return</jk> p;
}
<jc>// Equivalent method 2</jc>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/example2/{personId}"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/example2/{personId}"</js>)
<jk>public void</jk> doGet2(RestResponse res, <ja>@Path</ja>(<js>"personId"</js>) UUID personId) {
Person p = getPersonById(personId);
res.setOutput(p);
@@ -91,7 +91,7 @@ Method Return Types
<jc>// (Sorta) Equivalent method 3</jc>
<jc>// (Ignores any converters or method-level properties)</jc>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/example3/{personId}"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/example3/{personId}"</js>)
<jk>public void</jk> doGet3(RestRequest req, RestResponse res, <ja>@Path</ja>(<js>"personId"</js>) UUID personId) {
Person p = getPersonById(personId);
String accept = req.getHeader(<js>"Accept"</js>, <js>"text/json"</js>);
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/14.RestmMatchers.html b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/14.RestmMatchers.html
index 43ba23e..d344f3a 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/14.RestmMatchers.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/14.RestmMatchers.html
@@ -23,13 +23,13 @@
<h5 class='figure'>Example:</h5>
<p class='bpcode w800'>
<jc>// GET method that gets invoked for administrators</jc>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/*"</js>, matchers=IsAdminMatcher.<jk>class</jk>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/*"</js>, matchers=IsAdminMatcher.<jk>class</jk>)
<jk>public</jk> Object doGetForAdmin() {
...
}
<jc>// GET method that gets invoked for everyone else</jc>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/*"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/*"</js>)
<jk>public</jk> Object doGetForEveryoneElse() {
...
}
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/15.RestmPredefinedResponses.html b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/15.RestmPredefinedResponses.html
index 55106d9..84fe747 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/15.RestmPredefinedResponses.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/15.RestmPredefinedResponses.html
@@ -21,7 +21,7 @@ Predefined Responses
</p>
<h5 class='figure'>Examples:</h5>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<js>"POST"</js>, path=<js>"/pets"</js>)
+ <ja>@RestMethod</ja>(method=<js>"POST"</js>, path=<js>"/pets"</js>)
<jk>public</jk> Ok addPet(<ja>@Body</ja> Pet pet) {
<jsm>addPet</jsm>(Pet);
@@ -30,7 +30,7 @@ Predefined Responses
}
</p>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<js>"POST"</js>, path=<js>"/pets"</js>)
+ <ja>@RestMethod</ja>(method=<js>"POST"</js>, path=<js>"/pets"</js>)
<jk>public</jk> SeeOther addPet(<ja>@Body</ja> Pet pet) {
<jsm>addPet</jsm>(Pet);
@@ -116,7 +116,7 @@ Predefined Responses
in the following example (since all we see is an Object response).
</p>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<js>"POST"</js>, path=<js>"/pets"</js>)
+ <ja>@RestMethod</ja>(method=<js>"POST"</js>, path=<js>"/pets"</js>)
<jk>public</jk> Object addPet(<ja>@Body</ja> Pet pet) {
<jsm>addPet</jsm>(Pet);
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/16.RestmPredefinedExceptions.html b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/16.RestmPredefinedExceptions.html
index 4f47de9..9a059ce 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/16.RestmPredefinedExceptions.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/16.RestmPredefinedExceptions.html
@@ -25,7 +25,7 @@ Predefined Exceptions
</p>
<h5 class='figure'>Example:</h5>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/user/login"</js>)
+ <ja>@RestMethod</ja>(method=<js>"GET"</js>, path=<js>"/user/login"</js>)
<jk>public</jk> Ok login(
<ja>@FormData</ja>(<js>"username"</js>) String username,
<ja>@FormData</ja>(<js>"password"</js>) String password,
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/17.RestmPredefinedHelperBeans.html b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/17.RestmPredefinedHelperBeans.html
index 31a1f26..8f11834 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/17.RestmPredefinedHelperBeans.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/17.RestmPredefinedHelperBeans.html
@@ -40,7 +40,7 @@ Predefined Helper Beans
<ja>@Resource</ja>
<jk>public class</jk> PredefinedLabelsResource {
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/"</js>)
<jk>public</jk> ResourceDescription[] getChildMethods() {
<jk>return new</jk> ResourceDescription[] {
<jk>new</jk> ResourceDescription(<js>"beanDescription"</js>, <js>"BeanDescription"</js>),
@@ -75,7 +75,7 @@ Predefined Helper Beans
<ja>@Resource</ja>
<jk>public class</jk> PredefinedLabelsResource {
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/"</js>)
<jk>public</jk> ResourceDescriptions getChildMethods() {
<jk>return new</jk> ResourceDescriptions()
.append(<js>"beanDescription"</js>, <js>"BeanDescription"</js>)
@@ -138,7 +138,7 @@ Predefined Helper Beans
of a bean and it's properties.
</p>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/beanDescription"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/beanDescription"</js>)
<jk>public</jk> BeanDescription getBeanDescription() {
<jk>return new</jk> BeanDescription(Person.<jk>class</jk>);
}
@@ -160,7 +160,7 @@ Predefined Helper Beans
<ja>@Rest</ja>
<jk>public abstract class</jk> BasicRestServletGroup <jk>extends</jk> BasicRestServlet {
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/"</js>, summary=<js>"Navigation page"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/"</js>, summary=<js>"Navigation page"</js>)
<jk>public</jk> ChildResourceDescriptions getChildren(RestRequest req) <jk>throws</jk> Exception {
<jk>return new</jk> ChildResourceDescriptions(req);
}
@@ -201,7 +201,7 @@ Predefined Helper Beans
of a resource class.
</p>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<js>"POST"</js>, path=<js>"/pets"</js>)
+ <ja>@RestMethod</ja>(method=<js>"POST"</js>, path=<js>"/pets"</js>)
<jk>public</jk> SeeOtherRoot addPet(<ja>@Body</ja> Pet pet) {
<jsm>addPet</jsm>(Pet);
@@ -213,7 +213,7 @@ Predefined Helper Beans
The runtime behavior is the same as the following:
</p>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<js>"POST"</js>, path=<js>"/pets"</js>)
+ <ja>@RestMethod</ja>(method=<js>"POST"</js>, path=<js>"/pets"</js>)
<jk>public</jk> SeeOther addPet(<ja>@Body</ja> Pet pet) {
<jsm>addPet</jsm>(Pet);
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/07.RestRpc.html b/juneau-doc/docs/Topics/06.juneau-rest-server/07.RestRpc.html
index c3b7fb7..b88cc71 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/07.RestRpc.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/07.RestRpc.html
@@ -143,7 +143,7 @@ REST/RPC
<li>
Extending from {@link oajr.remote.RrpcServlet}.
<li>
- Using a <c><ja>@RestMethod</ja>(name=<jsf>RRPC</jsf>)</c> annotation on a Java method.
+ Using a <c><ja>@RestMethod</ja>(method=<jsf>RRPC</jsf>)</c> annotation on a Java method.
</ol>
<p>
In either case, the proxy communications layer is pure REST.
@@ -181,16 +181,16 @@ REST/RPC
}
</p>
-<h5 class='topic'>@RestMethod(name=RRPC)</h5>
+<h5 class='topic'>@RestMethod(method=RRPC)</h5>
<p>
- The <c><ja>@RestMethod</ja>(name=<jsf>RRPC</jsf>)</c> approach is easier if you only have a single
+ The <c><ja>@RestMethod</ja>(method=<jsf>RRPC</jsf>)</c> approach is easier if you only have a single
interface you want to expose.
You simply define a Java method whose return type is an interface, and return the implementation of that
interface:
</p>
<p class='bpcode w800'>
<jc>// Our exposed interface.</jc>
- <ja>@RestMethod</ja>(name=<jsf>RRPC</jsf>, path=<js>"/addressbookproxy/*"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>RRPC</jsf>, path=<js>"/addressbookproxy/*"</js>)
<jk>public</jk> IAddressBook getProxy() {
<jk>return</jk> addressBook;
}
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/01.RestBodyAnnotation.html b/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/01.RestBodyAnnotation.html
index a9842dd..38d9c25 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/01.RestBodyAnnotation.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/01.RestBodyAnnotation.html
@@ -35,12 +35,12 @@
<h5 class='figure'>Examples:</h5>
<p class='bpcode w800'>
<jc>// Defined on parameter</jc>
- <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
+ <ja>@RestMethod</ja>(method=<jsf>POST</jsf>)
<jk>public void</jk> addPet(<ja>@Body</ja> Pet pet) {...}
</p>
<p class='bpcode w800'>
<jc>// Defined on POJO class</jc>
- <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
+ <ja>@RestMethod</ja>(method=<jsf>POST</jsf>)
<jk>public void</jk> addPet(Pet pet) {...}
<ja>@Body</ja>
@@ -50,7 +50,7 @@
This is functionally equivalent to the following code:
</p>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
+ <ja>@RestMethod</ja>(method=<jsf>POST</jsf>)
<jk>public void</jk> addPet(RestRequest req) {
Person person = req.getBody().asType(Pet.<jk>class</jk>);
...
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/02.RestFormDataAnnotation.html b/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/02.RestFormDataAnnotation.html
index d6ce7a1..7b6b67e 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/02.RestFormDataAnnotation.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/02.RestFormDataAnnotation.html
@@ -55,7 +55,7 @@
</p>
<h5 class='figure'>Example:</h5>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
+ <ja>@RestMethod</ja>(method=<jsf>POST</jsf>)
<jk>public void</jk> doPost(
<ja>@FormData</ja>(<js>"p1"</js>) <jk>int</jk> p1,
<ja>@FormData</ja>(<js>"p2"</js>) String p2,
@@ -65,7 +65,7 @@
This is functionally equivalent to the following code:
</p>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
+ <ja>@RestMethod</ja>(method=<jsf>POST</jsf>)
<jk>public void</jk> doPost(RestRequest req) {
RequestFormData fd = req.getFormData();
<jk>int</jk> p1 = fd.get(<js>"p1"</js>, 0, <jk>int</jk>.<jk>class</jk>);
@@ -81,17 +81,17 @@
<h5 class='figure'>Examples:</h5>
<p class='bpcode w800'>
<jc>// Multiple values passed as a map.</jc>
- <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
+ <ja>@RestMethod</ja>(method=<jsf>POST</jsf>)
<jk>public void</jk> doPost(<ja>@FormData</ja>(<js>"*"</js>) Map<String,Object> map) {...}
</p>
<p class='bpcode w800'>
<jc>// Same, but name "*" is inferred.</jc>
- <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
+ <ja>@RestMethod</ja>(method=<jsf>POST</jsf>)
<jk>public void</jk> doPost(<ja>@FormData</ja> Map<String,Object> map) {...}
</p>
<p class='bpcode w800'>
<jc>// Multiple values passed as a bean.</jc>
- <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
+ <ja>@RestMethod</ja>(method=<jsf>POST</jsf>)
<jk>public void</jk> doPost(<ja>@FormData</ja> MyBean bean) {...}
</p>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/03.RestHasFormDataAnnotation.html b/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/03.RestHasFormDataAnnotation.html
index 7d37507..bcb0a78 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/03.RestHasFormDataAnnotation.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/03.RestHasFormDataAnnotation.html
@@ -24,14 +24,14 @@
<h5 class='figure'>Example:</h5>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
+ <ja>@RestMethod</ja>(method=<jsf>POST</jsf>)
<jk>public void</jk> doPost(<ja>@HasFormData</ja>(<js>"p1"</js>) <jk>boolean</jk> p1) {...}
</p>
<p>
This is functionally equivalent to the following code:
</p>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
+ <ja>@RestMethod</ja>(method=<jsf>POST</jsf>)
<jk>public void</jk> doPost(RestRequest req) {
<jk>boolean</jk> p1 = req.hasFormData(<js>"p1"</js>);
...
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/04.RestQueryAnnotation.html b/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/04.RestQueryAnnotation.html
index fdc1dc9..03b0f32 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/04.RestQueryAnnotation.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/04.RestQueryAnnotation.html
@@ -61,7 +61,7 @@
</p>
<h5 class='figure'>Example:</h5>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>)
<jk>public void</jk> doGet(
<ja>@Query</ja>(<js>"p1"</js>) <jk>int</jk> p1,
<ja>@Query</ja>(<js>"p2"</js>) String p2,
@@ -71,7 +71,7 @@
This is functionally equivalent to the following code:
</p>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>)
<jk>public void</jk> doGet(RestRequest req) {
RequestQuery q = req.getQuery();
<jk>int</jk> p1 = q.get(<js>"p1"</js>, 0, <jk>int</jk>.<jk>class</jk>);
@@ -88,17 +88,17 @@
<h5 class='figure'>Examples:</h5>
<p class='bpcode w800'>
<jc>// Multiple values passed as a map.</jc>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>)
<jk>public void</jk> doGet(<ja>@Query</ja>(<js>"*"</js>) Map<String,Object> map) {...}
</p>
<p class='bpcode w800'>
<jc>// Same, but name "*" is inferred.</jc>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>)
<jk>public void</jk> doGet(<ja>@Query</ja> Map<String,Object> map) {...}
</p>
<p class='bpcode w800'>
<jc>// Multiple values passed as a bean.</jc>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>)
<jk>public void</jk> doGet(<ja>@Query</ja> MyBean bean) {...}
</p>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/05.RestHasQueryAnnotation.html b/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/05.RestHasQueryAnnotation.html
index a4130e3..36488bc 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/05.RestHasQueryAnnotation.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/05.RestHasQueryAnnotation.html
@@ -30,14 +30,14 @@
</p>
<h5 class='figure'>Example:</h5>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>)
<jk>public void</jk> doGet(<ja>@HasQuery</ja>(<js>"p1"</js>) <jk>boolean</jk> p1) {...}
</p>
<p>
This is functionally equivalent to the following code:
</p>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>)
<jk>public void</jk> doGet(RestRequest req) {
<jk>boolean</jk> p1 = req.hasQuery(<js>"p1"</js>);
...
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/06.RestHeaderAnnotation.html b/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/06.RestHeaderAnnotation.html
index f848d69..cc207d2 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/06.RestHeaderAnnotation.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/06.RestHeaderAnnotation.html
@@ -53,14 +53,14 @@
</p>
<h5 class='figure'>Example:</h5>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>)
<jk>public void</jk> doGet(<ja>@Header</ja>(<js>"ETag"</js>) UUID etag) {...}
</p>
<p>
This is functionally equivalent to the following code:
</p>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>)
<jk>public void</jk> doGet(RestRequest req) {
RequestHeaders h = req.getHeaders();
UUID etag = h.get(<js>"ETag"</js>, UUID.<jk>class</jk>);
@@ -74,17 +74,17 @@
<h5 class='figure'>Examples:</h5>
<p class='bpcode w800'>
<jc>// Multiple values passed as a map.</jc>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>)
<jk>public void</jk> doGet(<ja>@Header</ja>(<js>"*"</js>) Map<String,Object> map) {...}
</p>
<p class='bpcode w800'>
<jc>// Same, but name "*" is inferred.</jc>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>)
<jk>public void</jk> doGet(<ja>@Header</ja> Map<String,Object> map) {...}
</p>
<p class='bpcode w800'>
<jc>// Multiple values passed as a bean.</jc>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>)
<jk>public void</jk> doGet(<ja>@Header</ja> MyBean bean) {...}
</p>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/07.RestPathAnnotation.html b/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/07.RestPathAnnotation.html
index b5368b9..b054adb 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/07.RestPathAnnotation.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/07.RestPathAnnotation.html
@@ -48,7 +48,7 @@
</p>
<h5 class='figure'>Example:</h5>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/myurl/{foo}/{bar}/{baz}/*"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/myurl/{foo}/{bar}/{baz}/*"</js>)
<jk>public void</jk> doGet(
<ja>@Path</ja>(<js>"foo"</js>) String foo,
<ja>@Path</ja>(<js>"bar"</js>) <jk>int</jk> bar,
@@ -60,7 +60,7 @@
This is functionally equivalent to the following code:
</p>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/myurl/{foo}/{bar}/{baz}/*"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/myurl/{foo}/{bar}/{baz}/*"</js>)
<jk>public void</jk> doGet(RestRequest req) {
RequestPath p = req.getPathMatch();
String foo = p.getString(<js>"foo"</js>);
@@ -80,17 +80,17 @@
<h5 class='figure'>Examples:</h5>
<p class='bpcode w800'>
<jc>// Multiple values passed as a map.</jc>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/{a}/{b}/{c}/*"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/{a}/{b}/{c}/*"</js>)
<jk>public void</jk> doGet(<ja>@Path</ja>(<js>"*"</js>) Map<String,Object> map) {...}
</p>
<p class='bpcode w800'>
<jc>// Same, but name "*" is inferred.</jc>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/{a}/{b}/{c}/*"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/{a}/{b}/{c}/*"</js>)
<jk>public void</jk> doGet(<ja>@Path</ja> Map<String,Object> map) {...}
</p>
<p class='bpcode w800'>
<jc>// Multiple values passed as a bean.</jc>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/{a}/{b}/{c}/*"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/{a}/{b}/{c}/*"</js>)
<jk>public void</jk> doGet(<ja>@Path</ja> MyBean bean) {...}
</p>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/09.RestResponseAnnotation.html b/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/09.RestResponseAnnotation.html
index 85f2ddb..571ea98 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/09.RestResponseAnnotation.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/09.RestResponseAnnotation.html
@@ -72,7 +72,7 @@
}
<jc>// Our REST method that throws an annotated exception.</jc>
- <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/user/login"</js>)
+ <ja>@RestMethod</ja>(method=<js>"GET"</js>, path=<js>"/user/login"</js>)
<jk>public</jk> Ok login(
<ja>@FormData</ja>(<js>"username"</js>) String username,
<ja>@FormData</ja>(<js>"password"</js>) String password
@@ -168,7 +168,7 @@
the same as applying it to the return type (albeit for this method only).
</p>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/user/login"</js>)
+ <ja>@RestMethod</ja>(method=<js>"GET"</js>, path=<js>"/user/login"</js>)
<ja>@Response</ja>(code=200, description=<js>"OK"</js>)
<jk>public</jk> Ok login(
<ja>@FormData</ja>(<js>"username"</js>) String username,
@@ -191,7 +191,7 @@
is {@link oaj.Value} (a placeholder for objects).
</p>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/user/login"</js>)
+ <ja>@RestMethod</ja>(method=<js>"GET"</js>, path=<js>"/user/login"</js>)
<jk>public void</jk> login(
<ja>@FormData</ja>(<js>"username"</js>) String username,
<ja>@FormData</ja>(<js>"password"</js>) String password,
@@ -221,7 +221,7 @@
that it's a <ja>@Response</ja> bean.
</p>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/user/login"</js>)
+ <ja>@RestMethod</ja>(method=<js>"GET"</js>, path=<js>"/user/login"</js>)
<jk>public void</jk> login(
...
Value<Ok> res <jc>// @Response annotation not needed.</jc>
@@ -384,7 +384,7 @@
The following two examples are equivalent:
</p>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/ok"</js>)
+ <ja>@RestMethod</ja>(method=<js>"GET"</js>, path=<js>"/ok"</js>)
<jk>public void</jk> sendContinue(
<ja>@Response</ja>(code=100) Value<String> body
)
@@ -393,7 +393,7 @@
}
</p>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/ok"</js>)
+ <ja>@RestMethod</ja>(method=<js>"GET"</js>, path=<js>"/ok"</js>)
<jk>public void</jk> sendContinue(RestResponse res) {
res.setStatus(100);
res.setOutput(<js>"OK"</js>);
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/11.RestResponseStatusAnnotation.html b/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/11.RestResponseStatusAnnotation.html
index c99aeef..9e79815 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/11.RestResponseStatusAnnotation.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/11.RestResponseStatusAnnotation.html
@@ -28,7 +28,7 @@
<h5 class='figure'>Examples:</h5>
<p class='bpcode w800'>
<jc>// Defined on parameter.</jc>
- <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/user/login"</js>)
+ <ja>@RestMethod</ja>(method=<js>"GET"</js>, path=<js>"/user/login"</js>)
<jk>public void</jk> login(
<ja>@FormData</ja>(<js>"username"</js>) String username,
<ja>@FormData</ja>(<js>"password"</js>) String password,
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/11.RestHandlingFormPosts.html b/juneau-doc/docs/Topics/06.juneau-rest-server/11.RestHandlingFormPosts.html
index 0509d07..7d9866e 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/11.RestHandlingFormPosts.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/11.RestHandlingFormPosts.html
@@ -27,7 +27,7 @@ Handling Form Posts
<jk>public class</jk> UrlEncodedFormResource <jk>extends</jk> BasicRestServlet {
<jd>/** POST request handler */</jd>
- <ja>@RestMethod</ja>(name=<jsf>POST</jsf>, path=<js>"/"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>POST</jsf>, path=<js>"/"</js>)
<jk>public</jk> Object doPost(<ja>@Body</ja> FormInputBean input) <jk>throws</jk> Exception {
<jc>// Just mirror back the request</jc>
<jk>return</jk> input;
@@ -46,7 +46,7 @@ Handling Form Posts
</p>
<p class='bpcode w800'>
<jd>/** POST request handler */</jd>
- <ja>@RestMethod</ja>(name=<jsf>POST</jsf>, path=<js>"/"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>POST</jsf>, path=<js>"/"</js>)
<jk>public</jk> Object doPost(<ja>@FormData</ja>(<js>"aString"</js>) String aString, <ja>@FormData</ja>(<js>"aNumber"</js>) <jk>int</jk> aNumber, <ja>@FormData</ja>(<js>"aDate"</js>) Calendar aDate) <jk>throws</jk> Exception {
...
}
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/12.RestHandlingMultiPartFormPosts.html b/juneau-doc/docs/Topics/06.juneau-rest-server/12.RestHandlingMultiPartFormPosts.html
index 7bd3217..225c092 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/12.RestHandlingMultiPartFormPosts.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/12.RestHandlingMultiPartFormPosts.html
@@ -34,7 +34,7 @@ Handling Multi-Part Form Posts
* [POST /upload] - Upload a file as a multipart form post.
* Shows how to use the Apache Commons ServletFileUpload class for handling multi-part form posts.
*/</jd>
- <ja>@RestMethod</ja>(name=<jsf>POST</jsf>, path=<js>"/upload"</js>, matchers=TempDirResource.MultipartFormDataMatcher.<jk>class</jk>)
+ <ja>@RestMethod</ja>(method=<jsf>POST</jsf>, path=<js>"/upload"</js>, matchers=TempDirResource.MultipartFormDataMatcher.<jk>class</jk>)
<jk>public</jk> Redirect uploadFile(RestRequest req) <jk>throws</jk> Exception {
ServletFileUpload upload = <jk>new</jk> ServletFileUpload();
FileItemIterator iter = upload.getItemIterator(req);
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/15.RestConfigurableProperties.html b/juneau-doc/docs/Topics/06.juneau-rest-server/15.RestConfigurableProperties.html
index c8ea10c..4583099 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/15.RestConfigurableProperties.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/15.RestConfigurableProperties.html
@@ -75,7 +75,7 @@ Configurable Properties
<p class='bpcode w800'>
<jc>// GET method with method-level properties</jc>
<ja>@RestMethod</ja>(
- name=<jsf>GET</jsf>, path=<js>"/*"</js>,
+ method=<jsf>GET</jsf>, path=<js>"/*"</js>,
properties={
<jc>// Bean properties should be sorted alphabetically.</jc>
<ja>@Property</ja>(name=<jsf>BEAN_sortProperties</jsf>, value=<js>"true"</js>),
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/19.RestGuards.html b/juneau-doc/docs/Topics/06.juneau-rest-server/19.RestGuards.html
index 0110c40..62af038 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/19.RestGuards.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/19.RestGuards.html
@@ -41,7 +41,7 @@ Guards
<jk>public</jk> MyRestServlet <jk>extends</jk> BasicRestServlet {
<jc>// Delete method that only Billy is allowed to call.</jc>
- <ja>@RestMethod</ja>(name=<js>"DELETE"</js>)
+ <ja>@RestMethod</ja>(method=<js>"DELETE"</js>)
<jk>public</jk> doDelete(RestRequest req, RestResponse res) <jk>throws</jk> Exception {...}
}
</p>
@@ -50,7 +50,7 @@ Guards
</p>
<p class='bpcode w800'>
<jc>// DELETE method</jc>
- <ja>@RestMethod</ja>(name=<jsf>DELETE</jsf>, guards={AdminGuard.<jk>class</jk>})
+ <ja>@RestMethod</ja>(method=<jsf>DELETE</jsf>, guards={AdminGuard.<jk>class</jk>})
<jk>public void</jk> doDelete(RestRequest req, RestResponse res) <jk>throws</jk> Exception {...}
</p>
<p class='bpcode w800'>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/22.RestMessages.html b/juneau-doc/docs/Topics/06.juneau-rest-server/22.RestMessages.html
index 38e82f0..115895a 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/22.RestMessages.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/22.RestMessages.html
@@ -70,7 +70,7 @@ Resource bundles are searched using the following base name patterns:
<ja>@Rest</ja>(messages=<js>"nls/MyMessages"</js>)
<jk>public class</jk> MyResource {...}
- <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/hello/{you}"</js>)
+ <ja>@RestMethod</ja>(method=<js>"GET"</js>, path=<js>"/hello/{you}"</js>)
<jk>public</jk> Object helloYou(RestRequest <jv>req</jv>, Messages <jv>messages</jv>, <ja>@Path</ja>(<js>"name"</js>) String <jv>you</jv>) {
String <jv>s</jv>;
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/25.RestConfigurationFiles.html b/juneau-doc/docs/Topics/06.juneau-rest-server/25.RestConfigurationFiles.html
index d8188fd..8072145 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/25.RestConfigurationFiles.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/25.RestConfigurationFiles.html
@@ -132,7 +132,7 @@ Configuration Files
* GET request handler.
* Specify the GET parameter "?person=X" for a specialized message!
*/</jd>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/"</js>)
<jk>public</jk> String sayHello(RestRequest req) {
<jk>return</jk> req.getConfig().getString(<js>"HelloWorldResource/message"</js>);
}
@@ -169,7 +169,7 @@ Configuration Files
* GET request handler.
* Specify the GET parameter "?person=X" for a specialized message!
*/</jd>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/"</js>)
<jk>public</jk> String sayHello(RestRequest req) {
<jk>return</jk> req.getConfig().getString(<js>"HelloWorldResource/message"</js>);
}
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/27.RestClientVersioning.html b/juneau-doc/docs/Topics/06.juneau-rest-server/27.RestClientVersioning.html
index f6e7323..f6dbf7a 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/27.RestClientVersioning.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/27.RestClientVersioning.html
@@ -35,19 +35,19 @@ Client Versioning
<jc>// Call this method if Client-Version is at least 2.0.
// Note that this also matches 2.0.1.</jc>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"2.0"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"2.0"</js>)
<jk>public</jk> Object method1() {
...
}
<jc>// Call this method if Client-Version is at least 1.1, but less than 2.0.</jc>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"[1.1,2.0)"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"[1.1,2.0)"</js>)
<jk>public</jk> Object method2() {
...
}
<jc>// Call this method if Client-Version is less than 1.1.</jc>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"[0,1.1)"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"[0,1.1)"</js>)
<jk>public</jk> Object method3() {
...
}
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/01.RestSwaggerBasicRestServlet.html b/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/01.RestSwaggerBasicRestServlet.html
index d2c979f..e19f2c6 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/01.RestSwaggerBasicRestServlet.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/01.RestSwaggerBasicRestServlet.html
@@ -45,7 +45,7 @@ BasicRestServlet
* <ja>@param</ja> req The HTTP request.
* <ja>@return</ja> A bean containing the contents for the OPTIONS page.
*/</jd>
- <ja>@RestMethod</ja>(name=<jsf>OPTIONS</jsf>, path=<js>"/*"</js>,
+ <ja>@RestMethod</ja>(method=<jsf>OPTIONS</jsf>, path=<js>"/*"</js>,
summary=<js>"Swagger documentation"</js>,
description=<js>"Swagger documentation for this resource."</js>,
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/03.RestSwaggerTags.html b/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/03.RestSwaggerTags.html
index 141f089..ab2a814 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/03.RestSwaggerTags.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/03.RestSwaggerTags.html
@@ -88,7 +88,7 @@ Tags
<h5 class='figure'>GET /user operation</h5>
<p class='bpcode w800'>
<ja>@RestMethod</ja>(
- name=<jsf>GET</jsf>,
+ method=<jsf>GET</jsf>,
path=<js>"/user"</js>,
summary=<js>"Petstore users"</js>,
swagger=<ja>@MethodSwagger</ja>(
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/04.RestSwaggerOperations.html b/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/04.RestSwaggerOperations.html
index 9085b1e..02dd201 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/04.RestSwaggerOperations.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/04.RestSwaggerOperations.html
@@ -25,7 +25,7 @@ Operations
<h5 class='figure'>PetStoreResource.getPets()</h5>
<p class='bpcode w800'>
<ja>@RestMethod</ja>(
- name=<jsf>GET</jsf>,
+ method=<jsf>GET</jsf>,
path=<js>"/pet"</js>,
summary=<js>"All pets in the store"</js>,
swagger=<ja>@MethodSwagger</ja>(
@@ -44,7 +44,7 @@ Operations
<h5 class='figure'>PetStoreResource.findPetsByTag()</h5>
<p class='bpcode w800'>
<ja>@RestMethod</ja>(
- name=<jsf>GET</jsf>,
+ method=<jsf>GET</jsf>,
path=<js>"/pet/findByTags"</js>,
summary=<js>"Finds Pets by tags"</js>,
...
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/05.RestSwaggerParameters.html b/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/05.RestSwaggerParameters.html
index d6a5c86..4ef0d35 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/05.RestSwaggerParameters.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/05.RestSwaggerParameters.html
@@ -71,7 +71,7 @@ Parameters
<h5 class='figure'>PetStoreResource.getPets()</h5>
<p class='bpcode w800'>
<ja>@RestMethod</ja>(
- name=<jsf>GET</jsf>,
+ method=<jsf>GET</jsf>,
path=<js>"/pet"</js>,
summary=<js>"All pets in the store"</js>,
swagger=<ja>@MethodSwagger</ja>(
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/06.RestSwaggerParameterExamples.html b/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/06.RestSwaggerParameterExamples.html
index 2172f8c..7b738d1 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/06.RestSwaggerParameterExamples.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/06.RestSwaggerParameterExamples.html
@@ -168,7 +168,7 @@ Parameter Examples
<p class='bpcode w800'>
<jk>public abstract class</jk> BasicRestServlet <jk>extends</jk> RestServlet <jk>implements</jk> BasicRestConfig {
- <ja>@RestMethod</ja>(name=<jsf>OPTIONS</jsf>, path=<js>"/*"</js>,
+ <ja>@RestMethod</ja>(method=<jsf>OPTIONS</jsf>, path=<js>"/*"</js>,
...
)
<ja>@JsonSchemaConfig</ja>(
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/07.RestSwaggerResponses.html b/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/07.RestSwaggerResponses.html
index 805919e..b58053e 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/07.RestSwaggerResponses.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/07.RestSwaggerResponses.html
@@ -24,7 +24,7 @@ Responses
</p>
<p class='bpcode w800'>
<ja>@RestMethod</ja>(
- name=<jsf>GET</jsf>,
+ method=<jsf>GET</jsf>,
path=<js>"/pet"</js>,
summary=<js>"All pets in the store"</js>,
...
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/08.RestSwaggerResponseExamples.html b/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/08.RestSwaggerResponseExamples.html
index 7c31984..08cc9e3 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/08.RestSwaggerResponseExamples.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/08.RestSwaggerResponseExamples.html
@@ -168,7 +168,7 @@ Response Examples
</p>
<p class='bpcode w800'>
<ja>@RestMethod</ja>(
- name=<jsf>GET</jsf>,
+ method=<jsf>GET</jsf>,
path=<js>"/user/login"</js>,
summary=<js>"Logs user into the system"</js>,
swagger=<ja>@MethodSwagger</ja>(
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/09.RestSwaggerModels.html b/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/09.RestSwaggerModels.html
index 3b26d05..d76f040 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/09.RestSwaggerModels.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/09.RestSwaggerModels.html
@@ -25,7 +25,7 @@ Models
<p class='bpcode w800'>
<jk>public abstract class</jk> BasicRestServlet <jk>extends</jk> RestServlet <jk>implements</jk> BasicRestConfig {
- <ja>@RestMethod</ja>(name=<jsf>OPTIONS</jsf>, path=<js>"/*"</js>,
+ <ja>@RestMethod</ja>(method=<jsf>OPTIONS</jsf>, path=<js>"/*"</js>,
...
flags={
<jc>// Use $ref references for bean definitions to reduce duplication in Swagger.</jc>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/31.RestHtmlDocAnnotation/02.RestHtmlWidgets.html b/juneau-doc/docs/Topics/06.juneau-rest-server/31.RestHtmlDocAnnotation/02.RestHtmlWidgets.html
index 4438fe8..143673b 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/31.RestHtmlDocAnnotation/02.RestHtmlWidgets.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/31.RestHtmlDocAnnotation/02.RestHtmlWidgets.html
@@ -13,6 +13,7 @@
***************************************************************************************************************************/
-->
+{todo}
Widgets
<p>
@@ -28,18 +29,17 @@ Widgets
</ul>
<h5 class='figure'>Example:</h5>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(
+ <ja>@RestMethod</ja>(...)
+ <ja>@HtmlDocConfig</ja>(
widgets={
MyWidget.<jk>class</jk>
+ },
+ navlinks={
+ <js>"$W{MyWidget}"</js>
+ },
+ aside={
+ <js>"Check out this widget: $W{MyWidget}"</js>
}
- htmldoc=<ja>@HtmlDoc</ja>(
- navlinks={
- <js>"$W{MyWidget}"</js>
- },
- aside={
- <js>"Check out this widget: $W{MyWidget}"</js>
- }
- )
)
</p>
<p>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/31.RestHtmlDocAnnotation/03.RestHtmlPredefinedWidgets.html b/juneau-doc/docs/Topics/06.juneau-rest-server/31.RestHtmlDocAnnotation/03.RestHtmlPredefinedWidgets.html
index 3912f00..812ed33 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/31.RestHtmlDocAnnotation/03.RestHtmlPredefinedWidgets.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/31.RestHtmlDocAnnotation/03.RestHtmlPredefinedWidgets.html
@@ -13,6 +13,7 @@
***************************************************************************************************************************/
-->
+{todo}
Predefined Widgets
<p>
@@ -84,7 +85,7 @@ Predefined Widgets
</p>
<p class='bpcode w800'>
<ja>@RestMethod</ja>(
- name=<jsf>GET</jsf>,
+ method=<jsf>GET</jsf>,
path=<js>"/"</js>,
widgets={
ContentTypeMenuItem.<jk>class</jk>,
@@ -124,7 +125,7 @@ Predefined Widgets
search/view/sort capabilities against the collection of POJOs:
<p class='bpcode w800'>
<ja>@RestMethod</ja>(
- name=<jsf>GET</jsf>,
+ method=<jsf>GET</jsf>,
path=<js>"/"</js>,
widgets={
QueryMenuItem.<jk>class</jk>,
@@ -171,7 +172,7 @@ Predefined Widgets
</p>
<p class='bpcode w800'>
<ja>@RestMethod</ja>(
- name=<jsf>GET</jsf>,
+ method=<jsf>GET</jsf>,
path=<js>"/"</js>,
widgets={
ThemeMenuItem.<jk>class</jk>,
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/35.RestOverloadingHttpMethods.html b/juneau-doc/docs/Topics/06.juneau-rest-server/35.RestOverloadingHttpMethods.html
index 476c8f5..5346be8 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/35.RestOverloadingHttpMethods.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/35.RestOverloadingHttpMethods.html
@@ -23,7 +23,7 @@ Overloading HTTP Methods
For example, the URL <l>"/sample/foo?method=BAR"</l> will cause the following method to be invoked...
</p>
<p class='bpcode w800'>
- <ja>@RestMethod</ja>(name=<js>"BAR"</js>)
+ <ja>@RestMethod</ja>(method=<js>"BAR"</js>)
<jk>public void</jk> doBar(RestRequest req, RestResponse res) {
<jc>// Handle BAR requests</jc>
}
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/37.RestCustomSerializersAndParsers.html b/juneau-doc/docs/Topics/06.juneau-rest-server/37.RestCustomSerializersAndParsers.html
index 02e0dde..2934136 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/37.RestCustomSerializersAndParsers.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/37.RestCustomSerializersAndParsers.html
@@ -64,7 +64,7 @@ Custom Serializers and Parsers
}
<jd>/** GET request handler for list of all photos */</jd>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/"</js>)
<jk>public</jk> Collection<Photo> getAllPhotos(RestRequest req, RestResponse res) <jk>throws</jk> Exception {
res.setPageTitle(<js>"Photo REST service"</js>);
res.setPageText(<js>"Use a tool like Poster to upload and retrieve jpeg and png images."</js>);
@@ -72,7 +72,7 @@ Custom Serializers and Parsers
}
<jd>/** GET request handler for single photo */</jd>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/{id}"</js>, serializers=ImageSerializer.<jk>class</jk>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/{id}"</js>, serializers=ImageSerializer.<jk>class</jk>)
<jk>public</jk> BufferedImage getPhoto(RestRequest req, <ja>@Path</ja>(<js>"id"</js>) int id) <jk>throws</jk> Exception {
Photo p = photos.get(id);
if (p == <jk>null</jk>)
@@ -81,14 +81,14 @@ Custom Serializers and Parsers
}
<jd>/** PUT request handler */</jd>
- <ja>@RestMethod</ja>(name=<jsf>PUT</jsf>, path=<js>"/{id}"</js>, parsers=ImageParser.<jk>class</jk>)
+ <ja>@RestMethod</ja>(method=<jsf>PUT</jsf>, path=<js>"/{id}"</js>, parsers=ImageParser.<jk>class</jk>)
<jk>public</jk> String addPhoto(RestRequest req, <ja>@Path</ja>(<js>"id"</js>) <jk>int</jk> id, <ja>@Body</ja> BufferedImage image) <jk>throws</jk> Exception {
photos.put(id, <jk>new</jk> Photo(id, image));
<jk>return</jk> <js>"OK"</js>;
}
<jd>/** POST request handler */</jd>
- <ja>@RestMethod</ja>(name=<jsf>POST</jsf>, path=<js>"/"</js>, parsers=ImageParser.<jk>class</jk>)
+ <ja>@RestMethod</ja>(method=<jsf>POST</jsf>, path=<js>"/"</js>, parsers=ImageParser.<jk>class</jk>)
<jk>public</jk> Photo setPhoto(RestRequest req, <ja>@Body</ja> BufferedImage image) <jk>throws</jk> Exception {
<jk>int</jk> id = photos.size();
Photo p = <jk>new</jk> Photo(id, image);
@@ -97,7 +97,7 @@ Custom Serializers and Parsers
}
<jd>/** DELETE request handler */</jd>
- <ja>@RestMethod</ja>(name=<jsf>DELETE</jsf>, path=<js>"/{id}"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>DELETE</jsf>, path=<js>"/{id}"</js>)
<jk>public</jk> String deletePhoto(RestRequest req, <ja>@Path</ja>(<js>"id"</js>) <jk>int</jk> id) <jk>throws</jk> Exception {
Photo p = photos.remove(id);
if (p == <jk>null</jk>)
@@ -106,7 +106,7 @@ Custom Serializers and Parsers
}
<jd>/** OPTIONS request handler */</jd>
- <ja>@RestMethod</ja>(name=<jsf>OPTIONS</jsf>, path=<js>"/*"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>OPTIONS</jsf>, path=<js>"/*"</js>)
<jk>public</jk> Swagger getOptions(RestRequest req) {
<jk>return</jk> req.getSwagger();
}
diff --git a/juneau-doc/docs/Topics/09.juneau-rest-client/11.RestcProxies/10.RestcDualPurposeInterfaces.html b/juneau-doc/docs/Topics/09.juneau-rest-client/11.RestcProxies/10.RestcDualPurposeInterfaces.html
index 7e7c9fb..39e3729 100644
--- a/juneau-doc/docs/Topics/09.juneau-rest-client/11.RestcProxies/10.RestcDualPurposeInterfaces.html
+++ b/juneau-doc/docs/Topics/09.juneau-rest-client/11.RestcProxies/10.RestcDualPurposeInterfaces.html
@@ -72,7 +72,7 @@ Dual-purpose (end-to-end) interfaces
<ja>@Override</ja> <jc>/* PetStore */</jc>
<ja>@RestMethod</ja>(
- name=<jsm>GET</jsm>,
+ method=<jsm>GET</jsm>,
path=<js>"/pet"</js>,
summary=<js>"All pets in the store"</js>,
...
@@ -83,7 +83,7 @@ Dual-purpose (end-to-end) interfaces
<ja>@Override</ja> <jc>/* PetStore */</jc>
<ja>@RestMethod</ja>(
- name=<jsf>DELETE</jsf>,
+ method=<jsf>DELETE</jsf>,
path=<js>"/pet/{petId}"</js>,
summary=<js>"Deletes a pet"</js>,
...
diff --git a/juneau-doc/docs/Topics/10.juneau-rest-mock/01.MockRestClient.html b/juneau-doc/docs/Topics/10.juneau-rest-mock/01.MockRestClient.html
index 8d58b34..68877d8 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-mock/01.MockRestClient.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-mock/01.MockRestClient.html
@@ -200,7 +200,7 @@ MockRestClient
<ja>@Rest</ja>
<jk>public class</jk> MyRest {
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/echoQuery"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/echoQuery"</js>)
<jk>public int</jk> echoQuery(<ja>@Query</ja>(<js>"id"</js>) String <jv>id</jv>) {
<jk>return</jk> <jv>id</jv>;
}
diff --git a/juneau-doc/docs/Topics/12.juneau-microservice-jetty/03.MicroserviceJettyResourceClasses.html b/juneau-doc/docs/Topics/12.juneau-microservice-jetty/03.MicroserviceJettyResourceClasses.html
index 1623b76..149585c 100644
--- a/juneau-doc/docs/Topics/12.juneau-microservice-jetty/03.MicroserviceJettyResourceClasses.html
+++ b/juneau-doc/docs/Topics/12.juneau-microservice-jetty/03.MicroserviceJettyResourceClasses.html
@@ -79,7 +79,7 @@ Resource Classes
)
<jk>public class</jk> HelloWorldResource <jk>extends</jk> BasicRestServlet {
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/*"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/*"</js>)
<jk>public</jk> String sayHello() {
<jk>return</jk> <js>"Hello world!"</js>;
}
diff --git a/juneau-doc/docs/Topics/12.juneau-microservice-jetty/05.MicroserviceJettyConfig.html b/juneau-doc/docs/Topics/12.juneau-microservice-jetty/05.MicroserviceJettyConfig.html
index 586328f..59abdcf 100644
--- a/juneau-doc/docs/Topics/12.juneau-microservice-jetty/05.MicroserviceJettyConfig.html
+++ b/juneau-doc/docs/Topics/12.juneau-microservice-jetty/05.MicroserviceJettyConfig.html
@@ -162,13 +162,13 @@ Config
<jk>public class</jk> MyHelloResource <jk>extends</jk> BasicRestServlet {
<jd>/** Standard hello message. */</jd>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/{person}"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/{person}"</js>)
<jk>public</jk> String sayHello(RestRequest req) {
<jk>return</jk> req.getConfig().getString(<js>"MyHelloResource/greeting"</js>);
}
<jd>/** Hello message in users language. */</jd>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/localized/{person}"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/localized/{person}"</js>)
<jk>public</jk> String sayLocalizedHello(RestRequest req) {
<jk>return</jk> req.getConfig().getString(<js>"MyHelloResource/localizedGreeting"</js>);
}
diff --git a/juneau-doc/docs/Topics/16.juneau-examples-rest/02.RestExamplesHelloWorldResource.html b/juneau-doc/docs/Topics/16.juneau-examples-rest/02.RestExamplesHelloWorldResource.html
index 62301bc..bbd4484 100644
--- a/juneau-doc/docs/Topics/16.juneau-examples-rest/02.RestExamplesHelloWorldResource.html
+++ b/juneau-doc/docs/Topics/16.juneau-examples-rest/02.RestExamplesHelloWorldResource.html
@@ -41,7 +41,7 @@ HelloWorldResource
<jk>public class</jk> HelloWorldResource <jk>implements</jk> BasicRestConfig {
<jd>/** GET request handler */</jd>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/*"</js>, summary=<js>"Responds with \"Hello world!\""</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/*"</js>, summary=<js>"Responds with \"Hello world!\""</js>)
<jk>public</jk> String sayHello() {
<jk>return</jk> <js>"Hello world!"</js>;
}
diff --git a/juneau-doc/docs/Topics/16.juneau-examples-rest/03.RestExamplesDtoExamples.html b/juneau-doc/docs/Topics/16.juneau-examples-rest/03.RestExamplesDtoExamples.html
index bc06f5c..ad045d9 100644
--- a/juneau-doc/docs/Topics/16.juneau-examples-rest/03.RestExamplesDtoExamples.html
+++ b/juneau-doc/docs/Topics/16.juneau-examples-rest/03.RestExamplesDtoExamples.html
@@ -119,7 +119,7 @@ DtoExamples
<jd>/**
* GET request handler
*/</jd>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/"</js>)
<jk>public</jk> Feed getFeed() <jk>throws</jk> Exception {
<jk>return</jk> <jf>feed</jf>;
}
@@ -128,7 +128,7 @@ DtoExamples
* PUT request handler.
* Replaces the feed with the specified content, and then mirrors it as the response.
*/</jd>
- <ja>@RestMethod</ja>(name=<jsf>PUT</jsf>, path=<js>"/"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>PUT</jsf>, path=<js>"/"</js>)
<jk>public</jk> Feed setFeed(<ja>@Body</ja> Feed feed) <jk>throws</jk> Exception {
<jk>this</jk>.<jf>feed</jf> = feed;
<jk>return</jk> feed;
@@ -215,7 +215,7 @@ DtoExamples
}
<jd>/** GET request handler */</jd>
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/"</js>)
<jk>public</jk> JsonSchema getSchema() <jk>throws</jk> Exception {
<jk>return</jk> <jf>schema</jf>;
}
@@ -224,7 +224,7 @@ DtoExamples
* PUT request handler.
* Replaces the schema document with the specified content, and then mirrors it as the response.
*/</jd>
- <ja>@RestMethod</ja>(name=<jsf>PUT</jsf>, path=<js>"/"</js>)
+ <ja>@RestMethod</ja>(method=<jsf>PUT</jsf>, path=<js>"/"</js>)
<jk>public</jk> JsonSchema setSchema(<ja>@Body</ja> JsonSchema schema) <jk>throws</jk> Exception {
<jk>this</jk>.<jf>schema</jf> = schema;
<jk>return</jk> schema;
diff --git a/juneau-doc/docs/Topics/16.juneau-examples-rest/04.RestExamplesConfigResource.html b/juneau-doc/docs/Topics/16.juneau-examples-rest/04.RestExamplesConfigResource.html
index d528af3..502680a 100644
--- a/juneau-doc/docs/Topics/16.juneau-examples-rest/04.RestExamplesConfigResource.html
+++ b/juneau-doc/docs/Topics/16.juneau-examples-rest/04.RestExamplesConfigResource.html
@@ -57,12 +57,12 @@ ConfigResource
)
<jk>public class</jk> ConfigResource <jk>extends</jk> BasicRestServlet {
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/"</js>, description=<js>"Show contents of config file."</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/"</js>, description=<js>"Show contents of config file."</js>)
<jk>public</jk> OMap getConfig() <jk>throws</jk> Exception {
<jk>return</jk> getServletConfig().getConfig().asMap();
}
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/edit"</js>, description=<js>"Edit config file."</js>)
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/edit"</js>, description=<js>"Edit config file."</js>)
<jk>public</jk> Form getConfigEditForm(RestRequest req) <jk>throws</jk> Exception {
<jk>return</jk> <jsm>form</jsm>().id(<js>"form"</js>).action(<js>"servlet:/"</js>).method(<js>"POST"</js>).enctype(<js>"application/x-www-form-urlencoded"</js>).children(
<jsm>div</jsm>()._class(<js>"data"</js>).children(
@@ -78,7 +78,7 @@ ConfigResource
);
}
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/{section}"</js>,
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/{section}"</js>,
description=<js>"Show config file section."</js>,
swagger={
<js>"parameters:["</js>,
@@ -90,7 +90,7 @@ ConfigResource
<jk>return</jk> getSection(section);
}
- <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/{section}/{key}"</js>,
+ <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/{section}/{key}"</js>,
description=<js>"Show config file entry."</js>,
swagger={
<js>"parameters:["</js>,
@@ -103,7 +103,7 @@ ConfigResource
<jk>return</jk> getSection(section).getString(key);
}
- <ja>@RestMethod</ja>(name=<jsf>POST</jsf>, path=<js>"/"</js>,
+ <ja>@RestMethod</ja>(method=<jsf>POST</jsf>, path=<js>"/"</js>,
description=<js>"Sets contents of config file from a FORM post."</js>,
swagger={
<js>"parameters:["</js>,
@@ -115,7 +115,7 @@ ConfigResource
<jk>return</jk> setConfigContents(<jk>new</jk> StringReader(contents));
}
- <ja>@RestMethod</ja>(name=<jsf>PUT</jsf>, path=<js>"/"</js>,
+ <ja>@RestMethod</ja>(method=<jsf>PUT</jsf>, path=<js>"/"</js>,
description=<js>"Sets contents of config file."</js>,
swagger={
<js>"parameters:["</js>,
@@ -127,7 +127,7 @@ ConfigResource
<jk>return</jk> getServletConfig().getConfig().load(contents, <jk>true</jk>).asMap();
}
- <ja>@RestMethod</ja>(name=<jsf>PUT</jsf>, path=<js>"/{section}"</js>,
+ <ja>@RestMethod</ja>(method=<jsf>PUT</jsf>, path=<js>"/{section}"</js>,
description=<js>"Add or overwrite a config file section."</js>,
swagger={
<js>"parameters:["</js>,
@@ -141,7 +141,7 @@ ConfigResource
<jk>return</jk> getSection(section);
}
- <ja>@RestMethod</ja>(name=<jsf>PUT</jsf>, path=<js>"/{section}/{key}"</js>,
+ <ja>@RestMethod</ja>(method=<jsf>PUT</jsf>, path=<js>"/{section}/{key}"</js>,
description=<js>"Add or overwrite a config file entry."</js>,
swagger={
<js>"parameters:["</js>,
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java
index 17d6841..75fd418 100644
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java
+++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java
@@ -45,7 +45,7 @@ public class HelloWorldResource implements BasicUniversalRest {
*
* @return A simple Hello-World message.
*/
- @RestMethod(name=GET, path="/*", summary="Responds with \"Hello world!\"")
+ @RestMethod(method=GET, path="/*", summary="Responds with \"Hello world!\"")
public String sayHello() {
return "Hello world!";
}
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java
index 1ee69bc..4485ce8 100644
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java
+++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java
@@ -85,7 +85,7 @@ public class RequestEchoResource extends BasicRest {
* @param req The HTTP servlet request.
* @return The same request to serialize as the response.
*/
- @RestMethod(name="*", path="/*", converters={Traversable.class,Queryable.class}, summary="Serializes the incoming HttpServletRequest object.")
+ @RestMethod(method="*", path="/*", converters={Traversable.class,Queryable.class}, summary="Serializes the incoming HttpServletRequest object.")
public HttpServletRequest doGet(RestRequest req) {
// Just echo the request back as the response.
return req;
diff --git a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/ConfigResource.java b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/ConfigResource.java
index 9faf566..2a4d2a7 100755
--- a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/ConfigResource.java
+++ b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/ConfigResource.java
@@ -51,7 +51,7 @@ public class ConfigResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
@RestMethod(
- name=GET,
+ method=GET,
path="/",
summary="Get config file contents",
description="Show contents of config file as an OMap.",
@@ -66,7 +66,7 @@ public class ConfigResource extends BasicRestServlet {
}
@RestMethod(
- name=GET,
+ method=GET,
path="/edit",
summary="Render form entry page for editing config file",
description="Renders a form entry page for editing the raw text of a config file."
@@ -87,7 +87,7 @@ public class ConfigResource extends BasicRestServlet {
}
@RestMethod(
- name=GET,
+ method=GET,
path="/{section}",
summary="Get config file section contents",
description="Show contents of config file section as an OMap.",
@@ -105,7 +105,7 @@ public class ConfigResource extends BasicRestServlet {
}
@RestMethod(
- name=GET,
+ method=GET,
path="/{section}/{key}",
summary="Get config file entry value",
description="Show value of config file entry as a simple string.",
@@ -124,7 +124,7 @@ public class ConfigResource extends BasicRestServlet {
}
@RestMethod(
- name=POST,
+ method=POST,
path="/",
summary="Update config file contents",
description="Update the contents of the config file from a FORM post.",
@@ -142,7 +142,7 @@ public class ConfigResource extends BasicRestServlet {
}
@RestMethod(
- name=PUT,
+ method=PUT,
path="/",
summary="Update config file contents",
description="Update the contents of the config file from raw text.",
@@ -160,7 +160,7 @@ public class ConfigResource extends BasicRestServlet {
}
@RestMethod(
- name=PUT,
+ method=PUT,
path="/{section}",
summary="Update config section contents",
description="Add or overwrite a config file section.",
@@ -183,7 +183,7 @@ public class ConfigResource extends BasicRestServlet {
}
@RestMethod(
- name=PUT,
+ method=PUT,
path="/{section}/{key}",
summary="Update config entry value",
description="Add or overwrite a config file entry.",
diff --git a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
index 89a387d..1d495f7 100755
--- a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
+++ b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
@@ -117,7 +117,7 @@ public class DirectoryResource extends BasicRestServlet {
}
@RestMethod(
- name=GET,
+ method=GET,
path="/*",
summary="View information on file or directory",
description="Returns information about the specified file or directory."
@@ -134,7 +134,7 @@ public class DirectoryResource extends BasicRestServlet {
}
@RestMethod(
- name="VIEW",
+ method="VIEW",
path="/*",
summary="View contents of file",
description="View the contents of a file.\nContent-Type is set to 'text/plain'."
@@ -152,7 +152,7 @@ public class DirectoryResource extends BasicRestServlet {
}
@RestMethod(
- name="DOWNLOAD",
+ method="DOWNLOAD",
path="/*",
summary="Download file",
description="Download the contents of a file.\nContent-Type is set to 'application/octet-stream'."
@@ -170,7 +170,7 @@ public class DirectoryResource extends BasicRestServlet {
}
@RestMethod(
- name=DELETE,
+ method=DELETE,
path="/*",
summary="Delete file",
description="Delete a file on the file system."
@@ -181,7 +181,7 @@ public class DirectoryResource extends BasicRestServlet {
}
@RestMethod(
- name=PUT,
+ method=PUT,
path="/*",
summary="Add or replace file",
description="Add or overwrite a file on the file system."
diff --git a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
index 69564f0..b14c749 100755
--- a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
+++ b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
@@ -107,7 +107,7 @@ public class LogsResource extends BasicRestServlet {
}
@RestMethod(
- name=GET,
+ method=GET,
path="/*",
summary="View information on file or directory",
description="Returns information about the specified file or directory."
@@ -124,7 +124,7 @@ public class LogsResource extends BasicRestServlet {
}
@RestMethod(
- name="VIEW",
+ method="VIEW",
path="/*",
summary="View contents of log file",
description="View the contents of a log file."
@@ -184,7 +184,7 @@ public class LogsResource extends BasicRestServlet {
}
@RestMethod(
- name="PARSE",
+ method="PARSE",
path="/*",
converters=Queryable.class,
summary="View parsed contents of file",
@@ -217,7 +217,7 @@ public class LogsResource extends BasicRestServlet {
}
@RestMethod(
- name="DOWNLOAD",
+ method="DOWNLOAD",
path="/*",
summary="Download file",
description="Download the contents of a file.\nContent-Type is set to 'application/octet-stream'."
@@ -232,7 +232,7 @@ public class LogsResource extends BasicRestServlet {
}
@RestMethod(
- name=DELETE,
+ method=DELETE,
path="/*",
summary="Delete log file",
description="Delete a log file on the file system."
diff --git a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/ShutdownResource.java b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/ShutdownResource.java
index d5619ad..82d0049 100755
--- a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/ShutdownResource.java
+++ b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/ShutdownResource.java
@@ -33,7 +33,7 @@ public class ShutdownResource extends BasicRestServlet {
*
* @return The string <js>"OK"</js>.
*/
- @RestMethod(name=GET, path="/", description="Show contents of config file.")
+ @RestMethod(method=GET, path="/", description="Show contents of config file.")
public String shutdown() {
new Thread(
new Runnable() {
diff --git a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/ConfigResource.java b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/ConfigResource.java
index 7d2d059..5808a6d 100644
--- a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/ConfigResource.java
+++ b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/ConfigResource.java
@@ -27,12 +27,12 @@ import org.apache.juneau.rest.annotation.*;
@SuppressWarnings({"serial"})
public class ConfigResource extends BasicRestServlet {
- @RestMethod(name=GET, path="/")
+ @RestMethod(method=GET, path="/")
public Object test1(RestRequest req) {
return req.getConfig().toMap();
}
- @RestMethod(name=GET, path="/{key}/{class}")
+ @RestMethod(method=GET, path="/{key}/{class}")
public Object test2(RestRequest req, @Path("key") String key, @Path("class") Class<?> c) throws Exception {
return req.getConfig().getObject(key, c);
}
diff --git a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/LargePojosResource.java b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/LargePojosResource.java
index 9ac1805..94f9df5 100644
--- a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/LargePojosResource.java
+++ b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/LargePojosResource.java
@@ -31,12 +31,12 @@ public class LargePojosResource extends BasicRestServletJena {
//====================================================================================================
// Test how long it takes to serialize/parse various content types.
//====================================================================================================
- @RestMethod(name=GET, path="/")
+ @RestMethod(method=GET, path="/")
public LargePojo testGet() {
return LargePojo.get();
}
- @RestMethod(name=PUT, path="/")
+ @RestMethod(method=PUT, path="/")
public String testPut(@Body LargePojo in) {
return "ok";
}
diff --git a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/Root.java b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/Root.java
index 55fe04b..7eaa60b 100644
--- a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/Root.java
+++ b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/Root.java
@@ -35,7 +35,7 @@ import org.apache.juneau.rest.test.client.*;
public class Root extends BasicRestServlet {
private static final long serialVersionUID = 1L;
- @RestMethod(name=GET, path="/")
+ @RestMethod(method=GET, path="/")
public ChildResourceDescriptions doGet(RestRequest req) throws Exception {
return new ChildResourceDescriptions(req);
}
diff --git a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java
index 2e6d9ad..4c514ec 100644
--- a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java
+++ b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java
@@ -102,7 +102,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
// Header tests
//-----------------------------------------------------------------------------------------------------------------
- @RestMethod(name=GET, path="/primitiveHeaders")
+ @RestMethod(method=GET, path="/primitiveHeaders")
public String primitiveHeaders(
@Header("a") String a,
@Header("an") String an,
@@ -125,7 +125,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/primitiveCollectionHeaders")
+ @RestMethod(method=GET, path="/primitiveCollectionHeaders")
public String primitiveCollectionHeaders(
@Header("a") int[][][] a,
@Header("b") Integer[][][] b,
@@ -154,7 +154,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/beanHeaders")
+ @RestMethod(method=GET, path="/beanHeaders")
public String beanHeaders(
@Header(name="a",cf="uon") ABean a,
@Header(name="an",cf="uon") ABean an,
@@ -187,7 +187,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/typedBeanHeaders")
+ @RestMethod(method=GET, path="/typedBeanHeaders")
public String typedBeanHeaders(
@Header(n="a",cf="uon") TypedBean a,
@Header(n="an",cf="uon") TypedBean an,
@@ -223,7 +223,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/swappedPojoHeaders")
+ @RestMethod(method=GET, path="/swappedPojoHeaders")
public String swappedPojoHeaders(
@Header(n="a",cf="uon") SwappedPojo a,
@Header(n="b",cf="uon") SwappedPojo[][][] b,
@@ -246,7 +246,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/implicitSwappedPojoHeaders")
+ @RestMethod(method=GET, path="/implicitSwappedPojoHeaders")
public String implicitSwappedPojoHeaders(
@Header(n="a",cf="uon") ImplicitSwappedPojo a,
@Header(n="b",cf="uon") ImplicitSwappedPojo[][][] b,
@@ -269,7 +269,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/enumHeaders")
+ @RestMethod(method=GET, path="/enumHeaders")
public String enumHeaders(
@Header(n="a",cf="uon") TestEnum a,
@Header(n="an",cf="uon") TestEnum an,
@@ -305,7 +305,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/mapHeader")
+ @RestMethod(method=GET, path="/mapHeader")
public String mapHeader(
@Header("a") String a,
@Header(name="b",allowEmptyValue=true) String b,
@@ -319,7 +319,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/beanHeader")
+ @RestMethod(method=GET, path="/beanHeader")
public String beanHeader(
@Header("a") String a,
@Header(name="b",allowEmptyValue=true) String b,
@@ -333,7 +333,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/nameValuePairsHeader")
+ @RestMethod(method=GET, path="/nameValuePairsHeader")
public String nameValuePairsHeader(
@Header("a") String a,
@Header(name="b",allowEmptyValue=true) String b,
@@ -347,7 +347,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/headerIfNE1")
+ @RestMethod(method=GET, path="/headerIfNE1")
public String headerIfNE1(
@Header("a") String a
) throws Exception {
@@ -357,7 +357,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/headerIfNE2")
+ @RestMethod(method=GET, path="/headerIfNE2")
public String headerIfNE2(
@Header("a") String a
) throws Exception {
@@ -367,7 +367,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/headerIfNEMap")
+ @RestMethod(method=GET, path="/headerIfNEMap")
public String headerIfNEMap(
@Header("a") String a,
@Header("b") String b,
@@ -381,7 +381,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/headerIfNEBean")
+ @RestMethod(method=GET, path="/headerIfNEBean")
public String headerIfNEBean(
@Header("a") String a,
@Header("b") String b,
@@ -395,7 +395,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/headerIfNEnameValuePairs")
+ @RestMethod(method=GET, path="/headerIfNEnameValuePairs")
public String headerIfNEnameValuePairs(
@Header("a") String a,
@Header("b") String b,
@@ -414,7 +414,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
// Query tests
//-----------------------------------------------------------------------------------------------------------------
- @RestMethod(name=GET, path="/primitiveQueries")
+ @RestMethod(method=GET, path="/primitiveQueries")
public String primitiveQueries(
@Query("a") String a,
@Query("an") String an,
@@ -437,7 +437,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/primitiveCollectionQueries")
+ @RestMethod(method=GET, path="/primitiveCollectionQueries")
public String primitiveCollectionQueries(
@Query("a") int[][][] a,
@Query("b") Integer[][][] b,
@@ -466,7 +466,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/beanQueries")
+ @RestMethod(method=GET, path="/beanQueries")
public String beanQueries(
@Query(n="a",cf="uon") ABean a,
@Query(n="an",cf="uon") ABean an,
@@ -499,7 +499,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/typedBeanQueries")
+ @RestMethod(method=GET, path="/typedBeanQueries")
public String typedBeanQueries(
@Query(n="a",cf="uon") TypedBean a,
@Query(n="an",cf="uon") TypedBean an,
@@ -535,7 +535,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/swappedPojoQueries")
+ @RestMethod(method=GET, path="/swappedPojoQueries")
public String swappedPojoQueries(
@Query(n="a",cf="uon") SwappedPojo a,
@Query(n="b",cf="uon") SwappedPojo[][][] b,
@@ -558,7 +558,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/implicitSwappedPojoQueries")
+ @RestMethod(method=GET, path="/implicitSwappedPojoQueries")
public String implicitSwappedPojoQueries(
@Query(n="a",cf="uon") ImplicitSwappedPojo a,
@Query(n="b",cf="uon") ImplicitSwappedPojo[][][] b,
@@ -581,7 +581,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/enumQueries")
+ @RestMethod(method=GET, path="/enumQueries")
public String enumQueries(
@Query(n="a",cf="uon") TestEnum a,
@Query(n="an",cf="uon") TestEnum an,
@@ -617,7 +617,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/stringQuery1")
+ @RestMethod(method=GET, path="/stringQuery1")
public String stringQuery1(
@Query("a") int a,
@Query("b") String b
@@ -629,7 +629,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/stringQuery2")
+ @RestMethod(method=GET, path="/stringQuery2")
public String stringQuery2(
@Query("a") int a,
@Query("b") String b
@@ -641,7 +641,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/mapQuery")
+ @RestMethod(method=GET, path="/mapQuery")
public String mapQuery(
@Query("a") int a,
@Query("b") String b
@@ -653,7 +653,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/beanQuery")
+ @RestMethod(method=GET, path="/beanQuery")
public String beanQuery(
@Query("a") String a,
@Query(n="b",allowEmptyValue=true) String b,
@@ -667,7 +667,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/nameValuePairsQuery")
+ @RestMethod(method=GET, path="/nameValuePairsQuery")
public String nameValuePairsQuery(
@Query("a") String a,
@Query(n="b",allowEmptyValue=true) String b,
@@ -681,7 +681,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/queryIfNE1")
+ @RestMethod(method=GET, path="/queryIfNE1")
public String queryIfNE1(
@Query("a") String a
) throws Exception {
@@ -691,7 +691,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/queryIfNE2")
+ @RestMethod(method=GET, path="/queryIfNE2")
public String queryIfNE2(
@Query("q") String a
) throws Exception {
@@ -701,7 +701,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/queryIfNEMap")
+ @RestMethod(method=GET, path="/queryIfNEMap")
public String queryIfNEMap(
@Query("a") String a,
@Query("b") String b,
@@ -715,7 +715,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/queryIfNEBean")
+ @RestMethod(method=GET, path="/queryIfNEBean")
public String queryIfNEBean(
@Query("a") String a,
@Query("b") String b,
@@ -729,7 +729,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=GET, path="/queryIfNEnameValuePairs")
+ @RestMethod(method=GET, path="/queryIfNEnameValuePairs")
public String queryIfNEnameValuePairs(
@Query("a") String a,
@Query("b") String b,
@@ -748,7 +748,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
// FormData tests
//-----------------------------------------------------------------------------------------------------------------
- @RestMethod(name=POST, path="/primitiveFormData")
+ @RestMethod(method=POST, path="/primitiveFormData")
public String primitiveFormData(
@FormData("a") String a,
@FormData("an") String an,
@@ -771,7 +771,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=POST, path="/primitiveCollectionFormData")
+ @RestMethod(method=POST, path="/primitiveCollectionFormData")
public String primitiveCollectionFormData(
@FormData("a") int[][][] a,
@FormData("b") Integer[][][] b,
@@ -800,7 +800,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=POST, path="/beanFormData")
+ @RestMethod(method=POST, path="/beanFormData")
public String beanFormData(
@FormData(n="a",cf="uon") ABean a,
@FormData(n="an",cf="uon") ABean an,
@@ -833,7 +833,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=POST, path="/typedBeanFormData")
+ @RestMethod(method=POST, path="/typedBeanFormData")
public String typedBeanFormData(
@FormData(n="a",cf="uon") TypedBean a,
@FormData(n="an",cf="uon") TypedBean an,
@@ -869,7 +869,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=POST, path="/swappedPojoFormData")
+ @RestMethod(method=POST, path="/swappedPojoFormData")
public String swappedPojoFormData(
@FormData(n="a",cf="uon") SwappedPojo a,
@FormData(n="b",cf="uon") SwappedPojo[][][] b,
@@ -892,7 +892,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=POST, path="/implicitSwappedPojoFormData")
+ @RestMethod(method=POST, path="/implicitSwappedPojoFormData")
public String implicitSwappedPojoFormData(
@FormData(n="a",cf="uon") ImplicitSwappedPojo a,
@FormData(n="b",cf="uon") ImplicitSwappedPojo[][][] b,
@@ -915,7 +915,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=POST, path="/enumFormData")
+ @RestMethod(method=POST, path="/enumFormData")
public String enumFormData(
@FormData(n="a",cf="uon") TestEnum a,
@FormData(n="an",cf="uon") TestEnum an,
@@ -951,7 +951,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=POST, path="/mapFormData")
+ @RestMethod(method=POST, path="/mapFormData")
public String mapFormData(
@FormData("a") String a,
@FormData(n="b",aev=true) String b,
@@ -965,7 +965,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=POST, path="/beanFormData2")
+ @RestMethod(method=POST, path="/beanFormData2")
public String beanFormData(
@FormData("a") String a,
@FormData(n="b",aev=true) String b,
@@ -979,7 +979,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=POST, path="/nameValuePairsFormData")
+ @RestMethod(method=POST, path="/nameValuePairsFormData")
public String nameValuePairsFormData(
@FormData("a") String a,
@FormData(n="b",aev=true) String b,
@@ -993,7 +993,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=POST, path="/formDataIfNE1")
+ @RestMethod(method=POST, path="/formDataIfNE1")
public String formDataIfNE1(
@FormData("a") String a
) throws Exception {
@@ -1003,7 +1003,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=POST, path="/formDataIfNE2")
+ @RestMethod(method=POST, path="/formDataIfNE2")
public String formDataIfNE2(
@FormData("a") String a
) throws Exception {
@@ -1013,7 +1013,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=POST, path="/formDataIfNEMap")
+ @RestMethod(method=POST, path="/formDataIfNEMap")
public String formDataIfNEMap(
@FormData("a") String a,
@FormData("b") String b,
@@ -1027,7 +1027,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=POST, path="/formDataIfNEBean")
+ @RestMethod(method=POST, path="/formDataIfNEBean")
public String formDataIfNEBean(
@FormData("a") String a,
@FormData("b") String b,
@@ -1041,7 +1041,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=POST, path="/formDataIfNENameValuePairs")
+ @RestMethod(method=POST, path="/formDataIfNENameValuePairs")
public String formDataIfNENameValuePairs(
@FormData("a") String a,
@FormData("b") String b,
@@ -1060,7 +1060,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
// Path tests
//-----------------------------------------------------------------------------------------------------------------
- @RestMethod(name=POST, path="/pathVars1/{a}/{b}")
+ @RestMethod(method=POST, path="/pathVars1/{a}/{b}")
public String pathVars1(
@Path("a") int a,
@Path("b") String b
@@ -1073,7 +1073,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
}
- @RestMethod(name=POST, path="/pathVars2/{a}/{b}")
+ @RestMethod(method=POST, path="/pathVars2/{a}/{b}")
public String pathVars2(
@Path("a") int a,
@Path("b") String b
@@ -1085,7 +1085,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=POST, path="/pathVars3/{a}/{b}")
+ @RestMethod(method=POST, path="/pathVars3/{a}/{b}")
public String pathVars3(
@Path("a") int a,
@Path("b") String b
@@ -1101,7 +1101,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
// @Request tests
//-----------------------------------------------------------------------------------------------------------------
- @RestMethod(name=POST, path="/reqBeanPath/{a}/{b}")
+ @RestMethod(method=POST, path="/reqBeanPath/{a}/{b}")
public String reqBeanPath(
@Path("a") int a,
@Path("b") String b
@@ -1113,7 +1113,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=POST, path="/reqBeanQuery")
+ @RestMethod(method=POST, path="/reqBeanQuery")
public String reqBeanQuery(
@Query("a") int a,
@Query("b") String b
@@ -1125,7 +1125,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=POST, path="/reqBeanQueryIfNE")
+ @RestMethod(method=POST, path="/reqBeanQueryIfNE")
public String reqBeanQueryIfNE(
@Query("a") String a,
@Query("b") String b,
@@ -1139,7 +1139,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=POST, path="/reqBeanFormData")
+ @RestMethod(method=POST, path="/reqBeanFormData")
public String reqBeanFormData(
@FormData("a") int a,
@FormData("b") String b
@@ -1151,7 +1151,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=POST, path="/reqBeanFormDataIfNE")
+ @RestMethod(method=POST, path="/reqBeanFormDataIfNE")
public String reqBeanFormDataIfNE(
@FormData("a") String a,
@FormData("b") String b,
@@ -1165,7 +1165,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=POST, path="/reqBeanHeader")
+ @RestMethod(method=POST, path="/reqBeanHeader")
public String reqBeanHeader(
@Header("a") int a,
@Header("b") String b
@@ -1177,7 +1177,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
return "OK";
}
- @RestMethod(name=POST, path="/reqBeanHeaderIfNE")
+ @RestMethod(method=POST, path="/reqBeanHeaderIfNE")
public String reqBeanHeaderIfNE(
@Header("a") String a,
@Header("b") String b,
@@ -1196,251 +1196,251 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
// Various primitives
- @RestMethod(name=GET, path="/returnVoid")
+ @RestMethod(method=GET, path="/returnVoid")
public void returnVoid() {
}
- @RestMethod(name=GET, path="/returnInteger")
+ @RestMethod(method=GET, path="/returnInteger")
public Integer returnInteger() {
return 1;
}
- @RestMethod(name=GET, path="/returnInt")
+ @RestMethod(method=GET, path="/returnInt")
public int returnInt() {
return 1;
}
- @RestMethod(name=GET, path="/returnBoolean")
+ @RestMethod(method=GET, path="/returnBoolean")
public boolean returnBoolean() {
return true;
}
- @RestMethod(name=GET, path="/returnFloat")
+ @RestMethod(method=GET, path="/returnFloat")
public float returnFloat() {
return 1f;
}
- @RestMethod(name=GET, path="/returnFloatObject")
+ @RestMethod(method=GET, path="/returnFloatObject")
public Float returnFloatObject() {
return 1f;
}
- @RestMethod(name=GET, path="/returnString")
+ @RestMethod(method=GET, path="/returnString")
public String returnString() {
return "foobar";
}
- @RestMethod(name=GET, path="/returnNullString")
+ @RestMethod(method=GET, path="/returnNullString")
public String returnNullString() {
return null;
}
- @RestMethod(name=GET, path="/returnInt3dArray")
+ @RestMethod(method=GET, path="/returnInt3dArray")
public int[][][] returnInt3dArray() {
return new int[][][]{{{1,2},null},null};
}
- @RestMethod(name=GET, path="/returnInteger3dArray")
+ @RestMethod(method=GET, path="/returnInteger3dArray")
public Integer[][][] returnInteger3dArray() {
return new Integer[][][]{{{1,null},null},null};
}
- @RestMethod(name=GET, path="/returnString3dArray")
+ @RestMethod(method=GET, path="/returnString3dArray")
public String[][][] returnString3dArray() {
return new String[][][]{{{"foo","bar",null},null},null};
}
- @RestMethod(name=GET, path="/returnIntegerList")
+ @RestMethod(method=GET, path="/returnIntegerList")
public List<Integer> returnIntegerList() {
return asList(new Integer[]{1,null});
}
- @RestMethod(name=GET, path="/returnInteger3dList")
+ @RestMethod(method=GET, path="/returnInteger3dList")
public List<List<List<Integer>>> returnInteger3dList() {
return AList.of(AList.of(AList.of(1,null),null),null);
}
- @RestMethod(name=GET, path="/returnInteger1d3dList")
+ @RestMethod(method=GET, path="/returnInteger1d3dList")
public List<Integer[][][]> returnInteger1d3dList() {
return AList.of(new Integer[][][]{{{1,null},null},null},null);
}
- @RestMethod(name=GET, path="/returnInt1d3dList")
+ @RestMethod(method=GET, path="/returnInt1d3dList")
public List<int[][][]> returnInt1d3dList() {
return AList.of(new int[][][]{{{1,2},null},null},null);
}
- @RestMethod(name=GET, path="/returnStringList")
+ @RestMethod(method=GET, path="/returnStringList")
public List<String> returnStringList() {
return asList(new String[]{"foo","bar",null});
}
// Beans
- @RestMethod(name=GET, path="/returnBean")
+ @RestMethod(method=GET, path="/returnBean")
public ABean returnBean() {
return ABean.get();
}
- @RestMethod(name=GET, path="/returnBean3dArray")
+ @RestMethod(method=GET, path="/returnBean3dArray")
public ABean[][][] returnBean3dArray() {
return new ABean[][][]{{{ABean.get(),null},null},null};
}
- @RestMethod(name=GET, path="/returnBeanList")
+ @RestMethod(method=GET, path="/returnBeanList")
public List<ABean> returnBeanList() {
return asList(ABean.get());
}
- @RestMethod(name=GET, path="/returnBean1d3dList")
+ @RestMethod(method=GET, path="/returnBean1d3dList")
public List<ABean[][][]> returnBean1d3dList() {
return AList.of(new ABean[][][]{{{ABean.get(),null},null},null},null);
}
- @RestMethod(name=GET, path="/returnBeanMap")
+ @RestMethod(method=GET, path="/returnBeanMap")
public Map<String,ABean> returnBeanMap() {
return AMap.of("foo",ABean.get());
}
- @RestMethod(name=GET, path="/returnBeanListMap")
+ @RestMethod(method=GET, path="/returnBeanListMap")
public Map<String,List<ABean>> returnBeanListMap() {
return AMap.of("foo",asList(ABean.get()));
}
- @RestMethod(name=GET, path="/returnBean1d3dListMap")
+ @RestMethod(method=GET, path="/returnBean1d3dListMap")
public Map<String,List<ABean[][][]>> returnBean1d3dListMap() {
return AMap.of("foo", AList.of(new ABean[][][]{{{ABean.get(),null},null},null},null));
}
- @RestMethod(name=GET, path="/returnBeanListMapIntegerKeys")
+ @RestMethod(method=GET, path="/returnBeanListMapIntegerKeys")
public Map<Integer,List<ABean>> returnBeanListMapIntegerKeys() {
return AMap.of(1,asList(ABean.get()));
}
// Typed beans
- @RestMethod(name=GET, path="/returnTypedBean")
+ @RestMethod(method=GET, path="/returnTypedBean")
public TypedBean returnTypedBean() {
return TypedBeanImpl.get();
}
- @RestMethod(name=GET, path="/returnTypedBean3dArray")
+ @RestMethod(method=GET, path="/returnTypedBean3dArray")
public TypedBean[][][] returnTypedBean3dArray() {
return new TypedBean[][][]{{{TypedBeanImpl.get(),null},null},null};
}
- @RestMethod(name=GET, path="/returnTypedBeanList")
+ @RestMethod(method=GET, path="/returnTypedBeanList")
public List<TypedBean> returnTypedBeanList() {
return asList((TypedBean)TypedBeanImpl.get());
}
- @RestMethod(name=GET, path="/returnTypedBean1d3dList")
+ @RestMethod(method=GET, path="/returnTypedBean1d3dList")
public List<TypedBean[][][]> returnTypedBean1d3dList() {
return AList.of(new TypedBean[][][]{{{TypedBeanImpl.get(),null},null},null},null);
}
- @RestMethod(name=GET, path="/returnTypedBeanMap")
+ @RestMethod(method=GET, path="/returnTypedBeanMap")
public Map<String,TypedBean> returnTypedBeanMap() {
return AMap.of("foo",TypedBeanImpl.get());
}
- @RestMethod(name=GET, path="/returnTypedBeanListMap")
+ @RestMethod(method=GET, path="/returnTypedBeanListMap")
public Map<String,List<TypedBean>> returnTypedBeanListMap() {
return AMap.of("foo",asList((TypedBean)TypedBeanImpl.get()));
}
- @RestMethod(name=GET, path="/returnTypedBean1d3dListMap")
+ @RestMethod(method=GET, path="/returnTypedBean1d3dListMap")
public Map<String,List<TypedBean[][][]>> returnTypedBean1d3dListMap() {
return AMap.of("foo", AList.of(new TypedBean[][][]{{{TypedBeanImpl.get(),null},null},null},null));
}
- @RestMethod(name=GET, path="/returnTypedBeanListMapIntegerKeys")
+ @RestMethod(method=GET, path="/returnTypedBeanListMapIntegerKeys")
public Map<Integer,List<TypedBean>> returnTypedBeanListMapIntegerKeys() {
return AMap.of(1,asList((TypedBean)TypedBeanImpl.get()));
}
// Swapped POJOs
- @RestMethod(name=GET, path="/returnSwappedPojo")
+ @RestMethod(method=GET, path="/returnSwappedPojo")
public SwappedPojo returnSwappedPojo() {
return new SwappedPojo();
}
- @RestMethod(name=GET, path="/returnSwappedPojo3dArray")
+ @RestMethod(method=GET, path="/returnSwappedPojo3dArray")
public SwappedPojo[][][] returnSwappedPojo3dArray() {
return new SwappedPojo[][][]{{{new SwappedPojo(),null},null},null};
}
- @RestMethod(name=GET, path="/returnSwappedPojoMap")
+ @RestMethod(method=GET, path="/returnSwappedPojoMap")
public Map<SwappedPojo,SwappedPojo> returnSwappedPojoMap() {
return AMap.of(new SwappedPojo(),new SwappedPojo());
}
- @RestMethod(name=GET, path="/returnSwappedPojo3dMap")
+ @RestMethod(method=GET, path="/returnSwappedPojo3dMap")
public Map<SwappedPojo,SwappedPojo[][][]> returnSwappedPojo3dMap() {
return AMap.of(new SwappedPojo(),new SwappedPojo[][][]{{{new SwappedPojo(),null},null},null});
}
// Implicit swapped POJOs
- @RestMethod(name=GET, path="/returnImplicitSwappedPojo")
+ @RestMethod(method=GET, path="/returnImplicitSwappedPojo")
public ImplicitSwappedPojo returnImplicitSwappedPojo() {
return new ImplicitSwappedPojo();
}
- @RestMethod(name=GET, path="/returnImplicitSwappedPojo3dArray")
+ @RestMethod(method=GET, path="/returnImplicitSwappedPojo3dArray")
public ImplicitSwappedPojo[][][] returnImplicitSwappedPojo3dArray() {
return new ImplicitSwappedPojo[][][]{{{new ImplicitSwappedPojo(),null},null},null};
}
- @RestMethod(name=GET, path="/returnImplicitSwappedPojoMap")
+ @RestMethod(method=GET, path="/returnImplicitSwappedPojoMap")
public Map<ImplicitSwappedPojo,ImplicitSwappedPojo> returnImplicitSwappedPojoMap() {
return AMap.of(new ImplicitSwappedPojo(),new ImplicitSwappedPojo());
}
- @RestMethod(name=GET, path="/returnImplicitSwappedPojo3dMap")
+ @RestMethod(method=GET, path="/returnImplicitSwappedPojo3dMap")
public Map<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]> returnImplicitSwappedPojo3dMap() {
return AMap.of(new ImplicitSwappedPojo(),new ImplicitSwappedPojo[][][]{{{new ImplicitSwappedPojo(),null},null},null});
}
// Enums
- @RestMethod(name=GET, path="/returnEnum")
+ @RestMethod(method=GET, path="/returnEnum")
public TestEnum returnEnum() {
return TestEnum.TWO;
}
- @RestMethod(name=GET, path="/returnEnum3d")
+ @RestMethod(method=GET, path="/returnEnum3d")
public TestEnum[][][] returnEnum3d() {
return new TestEnum[][][]{{{TestEnum.TWO,null},null},null};
}
- @RestMethod(name=GET, path="/returnEnumList")
+ @RestMethod(method=GET, path="/returnEnumList")
public List<TestEnum> returnEnumList() {
return AList.of(TestEnum.TWO,null);
}
- @RestMethod(name=GET, path="/returnEnum3dList")
+ @RestMethod(method=GET, path="/returnEnum3dList")
public List<List<List<TestEnum>>> returnEnum3dList() {
return AList.of(AList.of(AList.of(TestEnum.TWO,null),null),null);
}
- @RestMethod(name=GET, path="/returnEnum1d3dList")
+ @RestMethod(method=GET, path="/returnEnum1d3dList")
public List<TestEnum[][][]> returnEnum1d3dList() {
return AList.of(new TestEnum[][][]{{{TestEnum.TWO,null},null},null},null);
}
- @RestMethod(name=GET, path="/returnEnumMap")
+ @RestMethod(method=GET, path="/returnEnumMap")
public Map<TestEnum,TestEnum> returnEnumMap() {
return AMap.of(TestEnum.ONE,TestEnum.TWO);
}
- @RestMethod(name=GET, path="/returnEnum3dArrayMap")
+ @RestMethod(method=GET, path="/returnEnum3dArrayMap")
public Map<TestEnum,TestEnum[][][]> returnEnum3dArrayMap() {
return AMap.of(TestEnum.ONE,new TestEnum[][][]{{{TestEnum.TWO,null},null},null});
}
- @RestMethod(name=GET, path="/returnEnum1d3dListMap")
+ @RestMethod(method=GET, path="/returnEnum1d3dListMap")
public Map<TestEnum,List<TestEnum[][][]>> returnEnum1d3dListMap() {
return AMap.of(TestEnum.ONE,AList.of(new TestEnum[][][]{{{TestEnum.TWO,null},null},null},null));
}
@@ -1451,124 +1451,124 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
// Various primitives
- @RestMethod(name=POST, path="/setInt")
+ @RestMethod(method=POST, path="/setInt")
public void setInt(@Body int x) {
assertEquals(1, x);
}
- @RestMethod(name=POST, path="/setInteger")
+ @RestMethod(method=POST, path="/setInteger")
public void setInteger(@Body Integer x) {
assertEquals((Integer)1, x);
}
- @RestMethod(name=POST, path="/setBoolean")
+ @RestMethod(method=POST, path="/setBoolean")
public void setBoolean(@Body boolean x) {
assertTrue(x);
}
- @RestMethod(name=POST, path="/setFloat")
+ @RestMethod(method=POST, path="/setFloat")
public void setFloat(@Body float x) {
assertTrue(1f == x);
}
- @RestMethod(name=POST, path="/setFloatObject")
+ @RestMethod(method=POST, path="/setFloatObject")
public void setFloatObject(@Body Float x) {
assertTrue(1f == x);
}
- @RestMethod(name=POST, path="/setString")
+ @RestMethod(method=POST, path="/setString")
public void setString(@Body String x) {
assertEquals("foo", x);
}
- @RestMethod(name=POST, path="/setNullString")
+ @RestMethod(method=POST, path="/setNullString")
public void setNullString(@Body String x) {
assertNull(x);
}
- @RestMethod(name=POST, path="/setInt3dArray")
+ @RestMethod(method=POST, path="/setInt3dArray")
public String setInt3dArray(@Body int[][][] x) {
return ""+x[0][0][0];
}
- @RestMethod(name=POST, path="/setInteger3dArray")
+ @RestMethod(method=POST, path="/setInteger3dArray")
public void setInteger3dArray(@Body Integer[][][] x) {
assertObject(x).json().is("[[[1,null],null],null]");
}
- @RestMethod(name=POST, path="/setString3dArray")
+ @RestMethod(method=POST, path="/setString3dArray")
public void setString3dArray(@Body String[][][] x) {
assertObject(x).json().is("[[['foo',null],null],null]");
}
- @RestMethod(name=POST, path="/setIntegerList")
+ @RestMethod(method=POST, path="/setIntegerList")
public void setIntegerList(@Body List<Integer> x) {
assertObject(x).json().is("[1,null]");
assertObject(x.get(0)).isType(Integer.class);
}
- @RestMethod(name=POST, path="/setInteger3dList")
+ @RestMethod(method=POST, path="/setInteger3dList")
public void setInteger3dList(@Body List<List<List<Integer>>> x) {
assertObject(x).json().is("[[[1,null],null],null]");
assertObject(x.get(0).get(0).get(0)).isType(Integer.class);
}
- @RestMethod(name=POST, path="/setInteger1d3dList")
+ @RestMethod(method=POST, path="/setInteger1d3dList")
public void setInteger1d3dList(@Body List<Integer[][][]> x) {
assertObject(x).json().is("[[[[1,null],null],null],null]");
assertObject(x.get(0)).isType(Integer[][][].class);
assertObject(x.get(0)[0][0][0]).isType(Integer.class);
}
- @RestMethod(name=POST, path="/setInt1d3dList")
+ @RestMethod(method=POST, path="/setInt1d3dList")
public void setInt1d3dList(@Body List<int[][][]> x) {
assertObject(x).json().is("[[[[1,2],null],null],null]");
assertObject(x.get(0)).isType(int[][][].class);
}
- @RestMethod(name=POST, path="/setStringList")
+ @RestMethod(method=POST, path="/setStringList")
public void setStringList(@Body List<String> x) {
assertObject(x).json().is("['foo','bar',null]");
}
// Beans
- @RestMethod(name=POST, path="/setBean")
+ @RestMethod(method=POST, path="/setBean")
public void setBean(@Body ABean x) {
assertObject(x).json().is("{a:1,b:'foo'}");
}
- @RestMethod(name=POST, path="/setBean3dArray")
+ @RestMethod(method=POST, path="/setBean3dArray")
public void setBean3dArray(@Body ABean[][][] x) {
assertObject(x).json().is("[[[{a:1,b:'foo'},null],null],null]");
}
- @RestMethod(name=POST, path="/setBeanList")
+ @RestMethod(method=POST, path="/setBeanList")
public void setBeanList(@Body List<ABean> x) {
assertObject(x).json().is("[{a:1,b:'foo'}]");
}
- @RestMethod(name=POST, path="/setBean1d3dList")
+ @RestMethod(method=POST, path="/setBean1d3dList")
public void setBean1d3dList(@Body List<ABean[][][]> x) {
assertObject(x).json().is("[[[[{a:1,b:'foo'},null],null],null],null]");
}
- @RestMethod(name=POST, path="/setBeanMap")
+ @RestMethod(method=POST, path="/setBeanMap")
public void setBeanMap(@Body Map<String,ABean> x) {
assertObject(x).json().is("{foo:{a:1,b:'foo'}}");
}
- @RestMethod(name=POST, path="/setBeanListMap")
+ @RestMethod(method=POST, path="/setBeanListMap")
public void setBeanListMap(@Body Map<String,List<ABean>> x) {
assertObject(x).json().is("{foo:[{a:1,b:'foo'}]}");
}
- @RestMethod(name=POST, path="/setBean1d3dListMap")
+ @RestMethod(method=POST, path="/setBean1d3dListMap")
public void setBean1d3dListMap(@Body Map<String,List<ABean[][][]>> x) {
assertObject(x).json().is("{foo:[[[[{a:1,b:'foo'},null],null],null],null]}");
}
- @RestMethod(name=POST, path="/setBeanListMapIntegerKeys")
+ @RestMethod(method=POST, path="/setBeanListMapIntegerKeys")
public void setBeanListMapIntegerKeys(@Body Map<Integer,List<ABean>> x) {
assertObject(x).json().is("{'1':[{a:1,b:'foo'}]}"); // Note: JsonSerializer serializes key as string.
assertObject(x.keySet().iterator().next()).isType(Integer.class);
@@ -1576,49 +1576,49 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
// Typed beans
- @RestMethod(name=POST, path="/setTypedBean")
+ @RestMethod(method=POST, path="/setTypedBean")
public void setTypedBean(@Body TypedBean x) {
assertObject(x).json().is("{a:1,b:'foo'}");
assertObject(x).isType(TypedBeanImpl.class);
}
- @RestMethod(name=POST, path="/setTypedBean3dArray")
+ @RestMethod(method=POST, path="/setTypedBean3dArray")
public void setTypedBean3dArray(@Body TypedBean[][][] x) {
assertObject(x).json().is("[[[{a:1,b:'foo'},null],null],null]");
assertObject(x[0][0][0]).isType(TypedBeanImpl.class);
}
- @RestMethod(name=POST, path="/setTypedBeanList")
+ @RestMethod(method=POST, path="/setTypedBeanList")
public void setTypedBeanList(@Body List<TypedBean> x) {
assertObject(x).json().is("[{a:1,b:'foo'}]");
assertObject(x.get(0)).isType(TypedBeanImpl.class);
}
- @RestMethod(name=POST, path="/setTypedBean1d3dList")
+ @RestMethod(method=POST, path="/setTypedBean1d3dList")
public void setTypedBean1d3dList(@Body List<TypedBean[][][]> x) {
assertObject(x).json().is("[[[[{a:1,b:'foo'},null],null],null],null]");
assertObject(x.get(0)[0][0][0]).isType(TypedBeanImpl.class);
}
- @RestMethod(name=POST, path="/setTypedBeanMap")
+ @RestMethod(method=POST, path="/setTypedBeanMap")
public void setTypedBeanMap(@Body Map<String,TypedBean> x) {
assertObject(x).json().is("{foo:{a:1,b:'foo'}}");
assertObject(x.get("foo")).isType(TypedBeanImpl.class);
}
- @RestMethod(name=POST, path="/setTypedBeanListMap")
+ @RestMethod(method=POST, path="/setTypedBeanListMap")
public void setTypedBeanListMap(@Body Map<String,List<TypedBean>> x) {
assertObject(x).json().is("{foo:[{a:1,b:'foo'}]}");
assertObject(x.get("foo").get(0)).isType(TypedBeanImpl.class);
}
- @RestMethod(name=POST, path="/setTypedBean1d3dListMap")
+ @RestMethod(method=POST, path="/setTypedBean1d3dListMap")
public void setTypedBean1d3dListMap(@Body Map<String,List<TypedBean[][][]>> x) {
assertObject(x).json().is("{foo:[[[[{a:1,b:'foo'},null],null],null],null]}");
assertObject(x.get("foo").get(0)[0][0][0]).isType(TypedBeanImpl.class);
}
- @RestMethod(name=POST, path="/setTypedBeanListMapIntegerKeys")
+ @RestMethod(method=POST, path="/setTypedBeanListMapIntegerKeys")
public void setTypedBeanListMapIntegerKeys(@Body Map<Integer,List<TypedBean>> x) {
assertObject(x).json().is("{'1':[{a:1,b:'foo'}]}"); // Note: JsonSerializer serializes key as string.
assertObject(x.get(1).get(0)).isType(TypedBeanImpl.class);
@@ -1626,18 +1626,18 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
// Swapped POJOs
- @RestMethod(name=POST, path="/setSwappedPojo")
+ @RestMethod(method=POST, path="/setSwappedPojo")
public void setSwappedPojo(@Body SwappedPojo x) {
assertTrue(x.wasUnswapped);
}
- @RestMethod(name=POST, path="/setSwappedPojo3dArray")
+ @RestMethod(method=POST, path="/setSwappedPojo3dArray")
public void setSwappedPojo3dArray(@Body SwappedPojo[][][] x) {
assertObject(x).json().is("[[['"+SWAP+"',null],null],null]");
assertTrue(x[0][0][0].wasUnswapped);
}
- @RestMethod(name=POST, path="/setSwappedPojoMap")
+ @RestMethod(method=POST, path="/setSwappedPojoMap")
public void setSwappedPojoMap(@Body Map<SwappedPojo,SwappedPojo> x) {
assertObject(x).json().is("{'"+SWAP+"':'"+SWAP+"'}");
Map.Entry<SwappedPojo,SwappedPojo> e = x.entrySet().iterator().next();
@@ -1645,7 +1645,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
assertTrue(e.getValue().wasUnswapped);
}
- @RestMethod(name=POST, path="/setSwappedPojo3dMap")
+ @RestMethod(method=POST, path="/setSwappedPojo3dMap")
public void setSwappedPojo3dMap(@Body Map<SwappedPojo,SwappedPojo[][][]> x) {
assertObject(x).json().is("{'"+SWAP+"':[[['"+SWAP+"',null],null],null]}");
Map.Entry<SwappedPojo,SwappedPojo[][][]> e = x.entrySet().iterator().next();
@@ -1655,18 +1655,18 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
// Implicit swapped POJOs
- @RestMethod(name=POST, path="/setImplicitSwappedPojo")
+ @RestMethod(method=POST, path="/setImplicitSwappedPojo")
public void setImplicitSwappedPojo(@Body ImplicitSwappedPojo x) {
assertTrue(x.wasUnswapped);
}
- @RestMethod(name=POST, path="/setImplicitSwappedPojo3dArray")
+ @RestMethod(method=POST, path="/setImplicitSwappedPojo3dArray")
public void setImplicitSwappedPojo3dArray(@Body ImplicitSwappedPojo[][][] x) {
assertObject(x).json().is("[[['"+SWAP+"',null],null],null]");
assertTrue(x[0][0][0].wasUnswapped);
}
- @RestMethod(name=POST, path="/setImplicitSwappedPojoMap")
+ @RestMethod(method=POST, path="/setImplicitSwappedPojoMap")
public void setImplicitSwappedPojoMap(@Body Map<ImplicitSwappedPojo,ImplicitSwappedPojo> x) {
assertObject(x).json().is("{'"+SWAP+"':'"+SWAP+"'}");
Map.Entry<ImplicitSwappedPojo,ImplicitSwappedPojo> e = x.entrySet().iterator().next();
@@ -1674,7 +1674,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
assertTrue(e.getValue().wasUnswapped);
}
- @RestMethod(name=POST, path="/setImplicitSwappedPojo3dMap")
+ @RestMethod(method=POST, path="/setImplicitSwappedPojo3dMap")
public void setImplicitSwappedPojo3dMap(@Body Map<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]> x) {
assertObject(x).json().is("{'"+SWAP+"':[[['"+SWAP+"',null],null],null]}");
Map.Entry<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]> e = x.entrySet().iterator().next();
@@ -1684,35 +1684,35 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
// Enums
- @RestMethod(name=POST, path="/setEnum")
+ @RestMethod(method=POST, path="/setEnum")
public void setEnum(@Body TestEnum x) {
assertEquals(TestEnum.TWO, x);
}
- @RestMethod(name=POST, path="/setEnum3d")
+ @RestMethod(method=POST, path="/setEnum3d")
public void setEnum3d(@Body TestEnum[][][] x) {
assertObject(x).json().is("[[['TWO',null],null],null]");
}
- @RestMethod(name=POST, path="/setEnumList")
+ @RestMethod(method=POST, path="/setEnumList")
public void setEnumList(@Body List<TestEnum> x) {
assertObject(x).json().is("['TWO',null]");
assertObject(x.get(0)).isType(TestEnum.class);
}
- @RestMethod(name=POST, path="/setEnum3dList")
+ @RestMethod(method=POST, path="/setEnum3dList")
public void setEnum3dList(@Body List<List<List<TestEnum>>> x) {
assertObject(x).json().is("[[['TWO',null],null],null]");
assertObject(x.get(0).get(0).get(0)).isType(TestEnum.class);
}
- @RestMethod(name=POST, path="/setEnum1d3dList")
+ @RestMethod(method=POST, path="/setEnum1d3dList")
public void setEnum1d3dList(@Body List<TestEnum[][][]> x) {
assertObject(x).json().is("[[[['TWO',null],null],null],null]");
assertObject(x.get(0)).isType(TestEnum[][][].class);
}
- @RestMethod(name=POST, path="/setEnumMap")
+ @RestMethod(method=POST, path="/setEnumMap")
public void setEnumMap(@Body Map<TestEnum,TestEnum> x) {
assertObject(x).json().is("{ONE:'TWO'}");
Map.Entry<TestEnum,TestEnum> e = x.entrySet().iterator().next();
@@ -1720,7 +1720,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
assertObject(e.getValue()).isType(TestEnum.class);
}
- @RestMethod(name=POST, path="/setEnum3dArrayMap")
+ @RestMethod(method=POST, path="/setEnum3dArrayMap")
public void setEnum3dArrayMap(@Body Map<TestEnum,TestEnum[][][]> x) {
assertObject(x).json().is("{ONE:[[['TWO',null],null],null]}");
Map.Entry<TestEnum,TestEnum[][][]> e = x.entrySet().iterator().next();
@@ -1728,7 +1728,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
assertObject(e.getValue()).isType(TestEnum[][][].class);
}
- @RestMethod(name=POST, path="/setEnum1d3dListMap")
+ @RestMethod(method=POST, path="/setEnum1d3dListMap")
public void setEnum1d3dListMap(@Body Map<TestEnum,List<TestEnum[][][]>> x) {
assertObject(x).json().is("{ONE:[[[['TWO',null],null],null],null]}");
Map.Entry<TestEnum,List<TestEnum[][][]>> e = x.entrySet().iterator().next();
@@ -1740,7 +1740,7 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
// PartFormatter tests
//-----------------------------------------------------------------------------------------------------------------
- @RestMethod(name=POST, path="/partFormatters/{p1}")
+ @RestMethod(method=POST, path="/partFormatters/{p1}")
public String partFormatter(
@Path("p1") String p1,
@Header("h1") String h1,
@@ -1760,12 +1760,12 @@ public class ThirdPartyProxyResource extends BasicRestServletJena {
// @RemoteMethod(returns=HTTP_STATUS)
//-----------------------------------------------------------------------------------------------------------------
- @RestMethod(name=GET, path="/httpStatusReturn200")
+ @RestMethod(method=GET, path="/httpStatusReturn200")
public void httpStatusReturn200(RestResponse res) {
res.setStatus(200);
}
- @RestMethod(name=GET, path="/httpStatusReturn404")
+ @RestMethod(method=GET, path="/httpStatusReturn404")
public void httpStatusReturn404(RestResponse res) {
res.setStatus(404);
}
diff --git a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/resources/DebugResource.java b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/resources/DebugResource.java
index f87240d..4ce8c48 100644
--- a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/resources/DebugResource.java
+++ b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/resources/DebugResource.java
@@ -50,7 +50,7 @@ public class DebugResource extends BasicRestServlet {
* @return Child utility links.
* @throws Exception
*/
- @RestMethod(name=GET, path="/", description="Show contents of config file.")
+ @RestMethod(method=GET, path="/", description="Show contents of config file.")
public ResourceDescriptions getChildren() throws Exception {
return new ResourceDescriptions()
.append("jetty/dump", "Jetty thread dump")
@@ -60,7 +60,7 @@ public class DebugResource extends BasicRestServlet {
/**
* [GET /jetty/dump] - Generates and retrieves the jetty thread dump.
*/
- @RestMethod(name=GET, path="/jetty/dump", description="Generates and retrieves the jetty thread dump.")
+ @RestMethod(method=GET, path="/jetty/dump", description="Generates and retrieves the jetty thread dump.")
public Reader getJettyDump(RestRequest req, RestResponse res) {
res.setContentType("text/plain");
return new StringReader(JettyMicroservice.getInstance().getServer().dump());
@@ -69,7 +69,7 @@ public class DebugResource extends BasicRestServlet {
/**
* [POST /jetty/dump] - Generates and saves the jetty thread dump file to jetty-thread-dump.log.
*/
- @RestMethod(name=POST, path="/jetty/dump", description="Generates and saves the jetty thread dump file to jetty-thread-dump.log.")
+ @RestMethod(method=POST, path="/jetty/dump", description="Generates and saves the jetty thread dump file to jetty-thread-dump.log.")
public String createJettyDump(RestRequest req, RestResponse res) throws Exception {
String dump = JettyMicroservice.getInstance().getServer().dump();
try (FileWriter fw = new FileWriter(req.getConfig().getString("Logging/logDir") + "/jetty-thread-dump.log")) {
diff --git a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
index 341cd92..c4f697a 100644
--- a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
+++ b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
@@ -85,7 +85,7 @@ public class RestClient_BasicCalls_Test {
public String[] postHeader(org.apache.juneau.rest.RestRequest req) {
return req.getHeaders().get(req.getHeader("Check"));
}
- @RestMethod(path="/",name="*")
+ @RestMethod(path="/",method="*")
public Reader echoMethod(@Method String method) {
return new StringReader(method);
}
diff --git a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_CallbackStrings_Test.java b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_CallbackStrings_Test.java
index 382d56f..26551db 100644
--- a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_CallbackStrings_Test.java
+++ b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RestClient_CallbackStrings_Test.java
@@ -33,11 +33,11 @@ public class RestClient_CallbackStrings_Test {
@Rest
public static class A {
- @RestMethod(name=GET,path="/*")
+ @RestMethod(method=GET,path="/*")
public OMap get(RestRequest req) throws Exception {
return OMap.of("method","GET","headers",getFooHeaders(req),"content",req.getBody().asString());
}
- @RestMethod(name=PUT,path="/*")
+ @RestMethod(method=PUT,path="/*")
public OMap put(RestRequest req) throws Exception {
return OMap.of("method","PUT","headers",getFooHeaders(req),"content",req.getBody().asString());
}
diff --git a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
index 8252f0f..8d19b2f 100644
--- a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
+++ b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
@@ -72,7 +72,7 @@ import org.apache.juneau.rest.client.RestRequest;
* <jk>public static class</jk> EchoRest {
*
* <ja>@RestMethod</ja>(
- * name=<jsf>PUT</jsf>,
+ * method=<jsf>PUT</jsf>,
* path=<js>"/echo"</js>
* )
* <jk>public</jk> MyBean echo(<ja>@Body</ja> MyBean bean) {
@@ -187,7 +187,7 @@ import org.apache.juneau.rest.client.RestRequest;
* <ja>@Rest</ja>
* <jk>public class</jk> MyRest {
*
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/echoQuery"</js>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/echoQuery"</js>)
* <jk>public int</jk> echoQuery(<ja>@Query</ja>(<js>"id"</js>) String id) {
* <jk>return</jk> id;
* }
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Header_AcceptCharset_Test.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Header_AcceptCharset_Test.java
index 7fc4715..75a4c2c 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Header_AcceptCharset_Test.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Header_AcceptCharset_Test.java
@@ -65,7 +65,7 @@ public class Header_AcceptCharset_Test {
@Rest(defaultCharset="utf-8")
public static class B {
- @RestMethod(name=PUT, parsers=TestParser.class, serializers=TestSerializer.class)
+ @RestMethod(method=PUT, parsers=TestParser.class, serializers=TestSerializer.class)
public String a(@Body String in) {
return in;
}
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Header_ContentType_Test.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Header_ContentType_Test.java
index 90e9955..6850cd4 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Header_ContentType_Test.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Header_ContentType_Test.java
@@ -37,7 +37,7 @@ public class Header_ContentType_Test {
parsers={P1.class,P2.class}
)
public static class A {
- @RestMethod(name=PUT)
+ @RestMethod(method=PUT)
public String a(@Body String in) {
return in;
}
@@ -71,7 +71,7 @@ public class Header_ContentType_Test {
parsers={P1.class,P2.class}
)
public static class B {
- @RestMethod(name=PUT, parsers=P3.class)
+ @RestMethod(method=PUT, parsers=P3.class)
public String a(@Body String in) {
return in;
}
@@ -114,7 +114,7 @@ public class Header_ContentType_Test {
parsers={P1.class,P2.class}
)
public static class C {
- @RestMethod(name=PUT, parsers={P3.class,Inherit.class})
+ @RestMethod(method=PUT, parsers={P3.class,Inherit.class})
public String a(@Body String in) {
return in;
}
@@ -146,7 +146,7 @@ public class Header_ContentType_Test {
parsers={P1.class,P2.class}
)
public static class D {
- @RestMethod(name=PUT, reqHeaders={"Content-Type: text/p3"}, parsers=P3.class)
+ @RestMethod(method=PUT, reqHeaders={"Content-Type: text/p3"}, parsers=P3.class)
public String a(@Body String in) {
return in;
}
@@ -187,7 +187,7 @@ public class Header_ContentType_Test {
parsers={P1.class,P2.class}
)
public static class E {
- @RestMethod(name=PUT, reqHeaders={"Content-Type: text/p3"}, parsers={Inherit.class,P3.class})
+ @RestMethod(method=PUT, reqHeaders={"Content-Type: text/p3"}, parsers={Inherit.class,P3.class})
public String a(@Body String in) {
return in;
}
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Paths_Test.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Paths_Test.java
index 3330ed2..ccf4131 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Paths_Test.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Paths_Test.java
@@ -47,7 +47,7 @@ public class Paths_Test {
@Rest
public static class A {
- @RestMethod(name=GET,path="/*")
+ @RestMethod(method=GET,path="/*")
public OMap get(RestRequest req, @Path("/*") String r) {
return getPaths(req).append("pathRemainder2", r).append("method",1);
}
@@ -195,7 +195,7 @@ public class Paths_Test {
//------------------------------------------------------------------------------------------------------------------
public static class B {
- @RestMethod(name=GET, path="/subpath/*")
+ @RestMethod(method=GET, path="/subpath/*")
public OMap get(RestRequest req, @Path("/*") String r) {
return getPaths(req).append("pathRemainder2", r).append("method",2);
}
@@ -347,7 +347,7 @@ public class Paths_Test {
@Rest(path="/a")
public static class C1 {
- @RestMethod(name=GET,path="/*")
+ @RestMethod(method=GET,path="/*")
public OMap get(RestRequest req, @Path("/*") String r) {
return getPaths(req).append("pathRemainder2", r).append("method",3);
}
@@ -499,7 +499,7 @@ public class Paths_Test {
@Rest(path="/a")
public static class D1 {
- @RestMethod(name=GET, path="/subpath/*")
+ @RestMethod(method=GET, path="/subpath/*")
public OMap get(RestRequest req, @Path("/*") String r) {
return getPaths(req).append("pathRemainder2", r).append("method",4);
}
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestMethod_Params_Test.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestMethod_Params_Test.java
index 201b621..d854ea2 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestMethod_Params_Test.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestMethod_Params_Test.java
@@ -54,15 +54,15 @@ public class RestMethod_Params_Test {
public String b(Messages t) {
return t == null ? null : t.getString("foo");
}
- @RestMethod(name=POST)
+ @RestMethod(method=POST)
public String c(InputStream t) throws IOException {
return read(t);
}
- @RestMethod(name=POST)
+ @RestMethod(method=POST)
public String d(ServletInputStream t) throws IOException {
return read(t);
}
- @RestMethod(name=POST)
+ @RestMethod(method=POST)
public String e(Reader t) throws IOException {
return read(t);
}
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Rest_PredefinedStatusCodes_Test.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Rest_PredefinedStatusCodes_Test.java
index 69f0a98..d74266d 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Rest_PredefinedStatusCodes_Test.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Rest_PredefinedStatusCodes_Test.java
@@ -35,7 +35,7 @@ public class Rest_PredefinedStatusCodes_Test {
//------------------------------------------------------------------------------------------------------------------
@Rest
public static class A {
- @RestMethod(name=PUT)
+ @RestMethod(method=PUT)
public Reader a(@Body String b) {
return new StringReader(b);
}
@@ -55,21 +55,21 @@ public class Rest_PredefinedStatusCodes_Test {
@Rest(parsers=JsonParser.class)
public static class B {
- @RestMethod(name=PUT)
+ @RestMethod(method=PUT)
public String a(@Body B1 in) {
return "OK";
}
public static class B1 {
public String f1;
}
- @RestMethod(name=PUT)
+ @RestMethod(method=PUT)
public String b(@Body B2 in) {
return "OK";
}
public static class B2 {
public int f1;
}
- @RestMethod(name=PUT)
+ @RestMethod(method=PUT)
public String c(@Body B3 in) {
return "OK";
}
@@ -77,21 +77,21 @@ public class Rest_PredefinedStatusCodes_Test {
public int f1;
private B3(){}
}
- @RestMethod(name=PUT)
+ @RestMethod(method=PUT)
public String d(@Body B4 in) {
return "OK";
}
public class B4 {
public B4(){}
}
- @RestMethod(name=PUT)
+ @RestMethod(method=PUT)
public String e(@Body B5 in) {
return "OK";
}
static class B5 {
public B5(){}
}
- @RestMethod(name=PUT)
+ @RestMethod(method=PUT)
public String f(@Body B6 in) {
return "OK";
}
@@ -102,7 +102,7 @@ public class Rest_PredefinedStatusCodes_Test {
throw new RuntimeException("Test error");
}
}
- @RestMethod(name=PUT, path="/g/{a1}")
+ @RestMethod(method=PUT, path="/g/{a1}")
public String g(@Query("p1") int t1, @Path("a1") int a1, @Header("h1") int h1) {
return "OK";
}
@@ -180,7 +180,7 @@ public class Rest_PredefinedStatusCodes_Test {
@Rest
public static class C {
- @RestMethod(name=GET, path="/")
+ @RestMethod(method=GET, path="/")
public String a() {
return "OK";
}
@@ -211,7 +211,7 @@ public class Rest_PredefinedStatusCodes_Test {
@Rest
public static class D {
- @RestMethod(name=GET, matchers=NeverMatcher.class)
+ @RestMethod(method=GET, matchers=NeverMatcher.class)
public String d() {
return "OK";
}
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
index 1f48732..94b222a 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
@@ -656,7 +656,7 @@ public class Swagger_Test {
@Rest
public static class E1 {
- @RestMethod(name=GET,path="/path/{foo}")
+ @RestMethod(method=GET,path="/path/{foo}")
public X a() {
return null;
}
@@ -687,7 +687,7 @@ public class Swagger_Test {
)
)
public static class E2 {
- @RestMethod(name=GET,path="/path/{foo}")
+ @RestMethod(method=GET,path="/path/{foo}")
public X a() {
return null;
}
@@ -718,7 +718,7 @@ public class Swagger_Test {
)
)
public static class E3 {
- @RestMethod(name=GET,path="/path/{foo}",
+ @RestMethod(method=GET,path="/path/{foo}",
swagger=@MethodSwagger("operationId:'b-operationId',summary:'b-summary',description:'b-description',deprecated:false,schemes:['b-scheme']")
)
public X a() {
@@ -751,7 +751,7 @@ public class Swagger_Test {
)
)
public static class E4 {
- @RestMethod(name=GET,path="/path/{foo}",
+ @RestMethod(method=GET,path="/path/{foo}",
swagger=@MethodSwagger(
operationId="c-operationId",
summary="c-summary",
@@ -789,7 +789,7 @@ public class Swagger_Test {
)
)
public static class E5 {
- @RestMethod(name=GET,path="/path/{foo}",
+ @RestMethod(method=GET,path="/path/{foo}",
swagger=@MethodSwagger(
summary="$L{foo}",
operationId="$L{foo}",
@@ -828,7 +828,7 @@ public class Swagger_Test {
)
)
public static class E6 {
- @RestMethod(name=GET,path="/path/{foo}",
+ @RestMethod(method=GET,path="/path/{foo}",
summary="d-summary",
description="d-description"
)
@@ -856,7 +856,7 @@ public class Swagger_Test {
)
)
public static class E7 {
- @RestMethod(name=GET,path="/path/{foo}",
+ @RestMethod(method=GET,path="/path/{foo}",
summary="d-summary",
description="d-description"
)
@@ -885,7 +885,7 @@ public class Swagger_Test {
@Rest
public static class F1 {
- @RestMethod(name=GET,path="/path/{foo}")
+ @RestMethod(method=GET,path="/path/{foo}")
public X a() {
return null;
}
@@ -899,7 +899,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}':{get:{tags:['a-tag']}}}"))
public static class F2 {
- @RestMethod(name=GET,path="/path/{foo}")
+ @RestMethod(method=GET,path="/path/{foo}")
public X a() {
return null;
}
@@ -913,7 +913,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}':{get:{tags:['a-tag']}}}"))
public static class F3 {
- @RestMethod(name=GET,path="/path/{foo}",swagger=@MethodSwagger("tags:['b-tag']"))
+ @RestMethod(method=GET,path="/path/{foo}",swagger=@MethodSwagger("tags:['b-tag']"))
public X a() {
return null;
}
@@ -927,7 +927,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}':{get:{tags:['a-tag']}}}"))
public static class F4 {
- @RestMethod(name=GET,path="/path/{foo}",swagger=@MethodSwagger(tags="['c-tag-1','c-tag-2']"))
+ @RestMethod(method=GET,path="/path/{foo}",swagger=@MethodSwagger(tags="['c-tag-1','c-tag-2']"))
public X a() {
return null;
}
@@ -941,7 +941,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}':{get:{tags:['a-tag']}}}"))
public static class F5 {
- @RestMethod(name=GET,path="/path/{foo}",swagger=@MethodSwagger(tags="c-tag-1, c-tag-2"))
+ @RestMethod(method=GET,path="/path/{foo}",swagger=@MethodSwagger(tags="c-tag-1, c-tag-2"))
public X a() {
return null;
}
@@ -955,7 +955,7 @@ public class Swagger_Test {
@Rest(messages="BasicRestInfoProviderTest", swagger=@ResourceSwagger("paths:{'/path/{foo}':{get:{tags:'a-tags'}}}"))
public static class F6 {
- @RestMethod(name=GET,path="/path/{foo}",swagger=@MethodSwagger(tags="$L{foo}"))
+ @RestMethod(method=GET,path="/path/{foo}",swagger=@MethodSwagger(tags="$L{foo}"))
public X a() {
return null;
}
@@ -974,7 +974,7 @@ public class Swagger_Test {
@Rest
public static class G1 {
- @RestMethod(name=GET,path="/path/{foo}")
+ @RestMethod(method=GET,path="/path/{foo}")
public X a() {
return null;
}
@@ -988,7 +988,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}':{get:{externalDocs:{description:'a-description',url:'a-url'}}}}"))
public static class G2 {
- @RestMethod(name=GET,path="/path/{foo}")
+ @RestMethod(method=GET,path="/path/{foo}")
public X a() {
return null;
}
@@ -1002,7 +1002,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}':{get:{externalDocs:{description:'a-description',url:'a-url'}}}}"))
public static class G3 {
- @RestMethod(name=GET,path="/path/{foo}",swagger=@MethodSwagger("externalDocs:{description:'b-description',url:'b-url'}"))
+ @RestMethod(method=GET,path="/path/{foo}",swagger=@MethodSwagger("externalDocs:{description:'b-description',url:'b-url'}"))
public X a() {
return null;
}
@@ -1016,7 +1016,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}':{get:{externalDocs:{description:'a-description',url:'a-url'}}}}"))
public static class G4 {
- @RestMethod(name=GET,path="/path/{foo}",swagger=@MethodSwagger(externalDocs=@ExternalDocs(description="c-description",url="c-url")))
+ @RestMethod(method=GET,path="/path/{foo}",swagger=@MethodSwagger(externalDocs=@ExternalDocs(description="c-description",url="c-url")))
public X a() {
return null;
}
@@ -1030,7 +1030,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}':{get:{externalDocs:{description:'a-description',url:'a-url'}}}}"))
public static class G5 {
- @RestMethod(name=GET,path="/path/{foo}",swagger=@MethodSwagger(externalDocs=@ExternalDocs("{description:'d-description',url:'d-url'}")))
+ @RestMethod(method=GET,path="/path/{foo}",swagger=@MethodSwagger(externalDocs=@ExternalDocs("{description:'d-description',url:'d-url'}")))
public X a() {
return null;
}
@@ -1044,7 +1044,7 @@ public class Swagger_Test {
@Rest(messages="BasicRestInfoProviderTest", swagger=@ResourceSwagger("paths:{'/path/{foo}':{get:{externalDocs:{description:'a-description',url:'a-url'}}}}"))
public static class G6 {
- @RestMethod(name=GET,path="/path/{foo}",swagger=@MethodSwagger(externalDocs=@ExternalDocs("{description:'$L{foo}',url:'$L{foo}'}")))
+ @RestMethod(method=GET,path="/path/{foo}",swagger=@MethodSwagger(externalDocs=@ExternalDocs("{description:'$L{foo}',url:'$L{foo}'}")))
public X a() {
return null;
}
@@ -1063,7 +1063,7 @@ public class Swagger_Test {
@Rest
public static class H1 {
- @RestMethod(name=GET,path="/path/{foo}")
+ @RestMethod(method=GET,path="/path/{foo}")
public X a() {
return null;
}
@@ -1077,7 +1077,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}':{get:{consumes:['a-consumes']}}}"))
public static class H2 {
- @RestMethod(name=GET,path="/path/{foo}")
+ @RestMethod(method=GET,path="/path/{foo}")
public X a() {
return null;
}
@@ -1091,7 +1091,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}':{get:{consumes:['a-consumes']}}}"))
public static class H3 {
- @RestMethod(name=GET,path="/path/{foo}",swagger=@MethodSwagger("consumes:['b-consumes']"))
+ @RestMethod(method=GET,path="/path/{foo}",swagger=@MethodSwagger("consumes:['b-consumes']"))
public X a() {
return null;
}
@@ -1105,7 +1105,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}':{get:{consumes:['a-consumes']}}}"))
public static class H4 {
- @RestMethod(name=GET,path="/path/{foo}",swagger=@MethodSwagger(consumes="['c-consumes-1','c-consumes-2']"))
+ @RestMethod(method=GET,path="/path/{foo}",swagger=@MethodSwagger(consumes="['c-consumes-1','c-consumes-2']"))
public X a() {
return null;
}
@@ -1119,7 +1119,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}':{get:{consumes:['a-consumes']}}}"))
public static class H5 {
- @RestMethod(name=GET,path="/path/{foo}",swagger=@MethodSwagger(consumes="c-consumes-1, c-consumes-2"))
+ @RestMethod(method=GET,path="/path/{foo}",swagger=@MethodSwagger(consumes="c-consumes-1, c-consumes-2"))
public X a() {
return null;
}
@@ -1133,7 +1133,7 @@ public class Swagger_Test {
@Rest(messages="BasicRestInfoProviderTest", swagger=@ResourceSwagger("paths:{'/path/{foo}':{get:{consumes:['a-consumes']}}}"))
public static class H6 {
- @RestMethod(name=GET,path="/path/{foo}",swagger=@MethodSwagger(consumes="['$L{foo}']"))
+ @RestMethod(method=GET,path="/path/{foo}",swagger=@MethodSwagger(consumes="['$L{foo}']"))
public X a() {
return null;
}
@@ -1147,7 +1147,7 @@ public class Swagger_Test {
@Rest(parsers={JsonParser.class})
public static class H7 {
- @RestMethod(name=PUT,path="/path2/{foo}")
+ @RestMethod(method=PUT,path="/path2/{foo}")
public X a() {
return null;
}
@@ -1161,7 +1161,7 @@ public class Swagger_Test {
@Rest(parsers={JsonParser.class})
public static class H8 {
- @RestMethod(name=PUT,path="/path2/{foo}",parsers={XmlParser.class})
+ @RestMethod(method=PUT,path="/path2/{foo}",parsers={XmlParser.class})
public X a() {
return null;
}
@@ -1175,7 +1175,7 @@ public class Swagger_Test {
@Rest(parsers={JsonParser.class},swagger=@ResourceSwagger("paths:{'/path2/{foo}':{put:{consumes:['a-consumes']}}}"))
public static class H9 {
- @RestMethod(name=PUT,path="/path2/{foo}",parsers={XmlParser.class})
+ @RestMethod(method=PUT,path="/path2/{foo}",parsers={XmlParser.class})
public X a() {
return null;
}
@@ -1194,7 +1194,7 @@ public class Swagger_Test {
@Rest
public static class I1 {
- @RestMethod(name=GET,path="/path/{foo}")
+ @RestMethod(method=GET,path="/path/{foo}")
public X a() {
return null;
}
@@ -1208,7 +1208,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}':{get:{produces:['a-produces']}}}"))
public static class I2 {
- @RestMethod(name=GET,path="/path/{foo}")
+ @RestMethod(method=GET,path="/path/{foo}")
public X a() {
return null;
}
@@ -1222,7 +1222,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}':{get:{produces:['a-produces']}}}"))
public static class I3 {
- @RestMethod(name=GET,path="/path/{foo}",swagger=@MethodSwagger("produces:['b-produces']"))
+ @RestMethod(method=GET,path="/path/{foo}",swagger=@MethodSwagger("produces:['b-produces']"))
public X a() {
return null;
}
@@ -1236,7 +1236,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}':{get:{produces:['a-produces']}}}"))
public static class I4 {
- @RestMethod(name=GET,path="/path/{foo}",swagger=@MethodSwagger(produces="['c-produces-1','c-produces-2']"))
+ @RestMethod(method=GET,path="/path/{foo}",swagger=@MethodSwagger(produces="['c-produces-1','c-produces-2']"))
public X a() {
return null;
}
@@ -1250,7 +1250,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}':{get:{produces:['a-produces']}}}"))
public static class I5 {
- @RestMethod(name=GET,path="/path/{foo}",swagger=@MethodSwagger(produces="c-produces-1, c-produces-2"))
+ @RestMethod(method=GET,path="/path/{foo}",swagger=@MethodSwagger(produces="c-produces-1, c-produces-2"))
public X a() {
return null;
}
@@ -1264,7 +1264,7 @@ public class Swagger_Test {
@Rest(messages="BasicRestInfoProviderTest", swagger=@ResourceSwagger("paths:{'/path/{foo}':{get:{produces:['a-produces']}}}"))
public static class I6 {
- @RestMethod(name=GET,path="/path/{foo}",swagger=@MethodSwagger(produces="['$L{foo}']"))
+ @RestMethod(method=GET,path="/path/{foo}",swagger=@MethodSwagger(produces="['$L{foo}']"))
public X a() {
return null;
}
@@ -1278,7 +1278,7 @@ public class Swagger_Test {
@Rest(serializers={JsonSerializer.class})
public static class I7 {
- @RestMethod(name=PUT,path="/path2/{foo}")
+ @RestMethod(method=PUT,path="/path2/{foo}")
public X a() {
return null;
}
@@ -1292,7 +1292,7 @@ public class Swagger_Test {
@Rest(serializers={JsonSerializer.class})
public static class I8 {
- @RestMethod(name=PUT,path="/path2/{foo}",serializers={XmlSerializer.class})
+ @RestMethod(method=PUT,path="/path2/{foo}",serializers={XmlSerializer.class})
public X a() {
return null;
}
@@ -1306,7 +1306,7 @@ public class Swagger_Test {
@Rest(serializers={JsonSerializer.class},swagger=@ResourceSwagger("paths:{'/path2/{foo}':{put:{produces:['a-produces']}}}"))
public static class I9 {
- @RestMethod(name=PUT,path="/path2/{foo}",serializers={XmlSerializer.class})
+ @RestMethod(method=PUT,path="/path2/{foo}",serializers={XmlSerializer.class})
public X a() {
return null;
}
@@ -1324,7 +1324,7 @@ public class Swagger_Test {
@Rest
public static class J1 {
- @RestMethod(name=GET,path="/path2/{foo}")
+ @RestMethod(method=GET,path="/path2/{foo}")
@Deprecated
public X a() {
return null;
@@ -1340,7 +1340,7 @@ public class Swagger_Test {
@Rest
@Deprecated
public static class J2 {
- @RestMethod(name=GET,path="/path2/{foo}")
+ @RestMethod(method=GET,path="/path2/{foo}")
public X a() {
return null;
}
@@ -1358,7 +1358,7 @@ public class Swagger_Test {
@Rest
public static class K1 {
- @RestMethod(name=GET,path="/path/{foo}/query")
+ @RestMethod(method=GET,path="/path/{foo}/query")
public X a(@Query("foo") X foo) {
return null;
}
@@ -1432,7 +1432,7 @@ public class Swagger_Test {
})
)
public static class K2 {
- @RestMethod(name=GET,path="/path/{foo}/query")
+ @RestMethod(method=GET,path="/path/{foo}/query")
public X a(@Query("foo") X foo) {
return null;
}
@@ -1507,7 +1507,7 @@ public class Swagger_Test {
})
)
public static class K3 {
- @RestMethod(name=GET,path="/path/{foo}/query",
+ @RestMethod(method=GET,path="/path/{foo}/query",
swagger=@MethodSwagger({
"parameters:[{",
"'in':'query',",
@@ -1585,7 +1585,7 @@ public class Swagger_Test {
@Rest
public static class L1 {
- @RestMethod(name=GET,path="/path/{foo}/query")
+ @RestMethod(method=GET,path="/path/{foo}/query")
public X a(@Query("foo") X foo) {
return null;
}
@@ -1599,7 +1599,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}/query':{get:{parameters:[{'in':'query',name:'foo',x-example:'{id:2}'}]}}}"))
public static class L2 {
- @RestMethod(name=GET,path="/path/{foo}/query")
+ @RestMethod(method=GET,path="/path/{foo}/query")
public X a(@Query("foo") X foo) {
return null;
}
@@ -1613,7 +1613,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}/query':{get:{parameters:[{'in':'query',name:'foo',x-example:'{id:2}'}]}}}"))
public static class L3 {
- @RestMethod(name=GET,path="/path/{foo}/query",swagger=@MethodSwagger("parameters:[{'in':'query',name:'foo',x-example:'{id:3}'}]"))
+ @RestMethod(method=GET,path="/path/{foo}/query",swagger=@MethodSwagger("parameters:[{'in':'query',name:'foo',x-example:'{id:3}'}]"))
public X a() {
return null;
}
@@ -1627,7 +1627,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}/query':{get:{parameters:[{'in':'query',name:'foo',x-example:'{id:2}'}]}}}"))
public static class L4 {
- @RestMethod(name=GET,path="/path/{foo}/query")
+ @RestMethod(method=GET,path="/path/{foo}/query")
public X a(@Query(n="foo",ex="{id:4}") X foo) {
return null;
}
@@ -1641,7 +1641,7 @@ public class Swagger_Test {
@Rest(messages="BasicRestInfoProviderTest", swagger=@ResourceSwagger("paths:{'/path/{foo}/query':{get:{parameters:[{'in':'query',name:'foo',x-example:'{id:2}'}]}}}"))
public static class L5 {
- @RestMethod(name=GET,path="/path/{foo}/query")
+ @RestMethod(method=GET,path="/path/{foo}/query")
public X a(@Query(n="foo",ex="{id:$L{5}}") X foo) {
return null;
}
@@ -1659,7 +1659,7 @@ public class Swagger_Test {
@Rest
public static class M1 {
- @RestMethod(name=GET,path="/path/{foo}/body")
+ @RestMethod(method=GET,path="/path/{foo}/body")
public X a(@Body X foo) {
return null;
}
@@ -1673,7 +1673,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}/body':{get:{parameters:[{'in':'body',x-examples:{foo:'b'}}]}}}"))
public static class M2 {
- @RestMethod(name=GET,path="/path/{foo}/body")
+ @RestMethod(method=GET,path="/path/{foo}/body")
public X a(@Body X foo) {
return null;
}
@@ -1687,7 +1687,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}/body':{get:{parameters:[{'in':'body',x-examples:{foo:'b'}}]}}}"))
public static class M3 {
- @RestMethod(name=GET,path="/path/{foo}/body",swagger=@MethodSwagger("parameters:[{'in':'body',x-examples:{foo:'c'}}]"))
+ @RestMethod(method=GET,path="/path/{foo}/body",swagger=@MethodSwagger("parameters:[{'in':'body',x-examples:{foo:'c'}}]"))
public X a() {
return null;
}
@@ -1701,7 +1701,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}/body':{get:{parameters:[{'in':'body',x-examples:{foo:'b'}}]}}}"))
public static class M4 {
- @RestMethod(name=GET,path="/path/{foo}/body")
+ @RestMethod(method=GET,path="/path/{foo}/body")
public X a(@Body(exs="{foo:'d'}") X foo) {
return null;
}
@@ -1715,7 +1715,7 @@ public class Swagger_Test {
@Rest(messages="BasicRestInfoProviderTest", swagger=@ResourceSwagger("paths:{'/path/{foo}/body':{get:{parameters:[{'in':'body',examples:{foo:'b'}}]}}}"))
public static class M5 {
- @RestMethod(name=GET,path="/path/{foo}/body")
+ @RestMethod(method=GET,path="/path/{foo}/body")
public X a(@Body(exs="{foo:'$L{foo}'}") X foo) {
return null;
}
@@ -1733,7 +1733,7 @@ public class Swagger_Test {
@Rest
public static class N1 {
- @RestMethod(name=GET,path="/path/{foo}/query")
+ @RestMethod(method=GET,path="/path/{foo}/query")
public X a(@Query("foo") X foo) {
return null;
}
@@ -1747,7 +1747,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}/query':{get:{parameters:[{in:'query',name:'foo',schema:{$ref:'b'}}]}}}"))
public static class N2 {
- @RestMethod(name=GET,path="/path/{foo}/query")
+ @RestMethod(method=GET,path="/path/{foo}/query")
public X a(@Query("foo") X foo) {
return null;
}
@@ -1762,7 +1762,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}/query':{get:{parameters:[{in:'query',name:'foo',schema:{$ref:'b'}}]}}}"))
public static class N3 {
- @RestMethod(name=GET,path="/path/{foo}/query",swagger=@MethodSwagger("parameters:[{'in':'query',name:'foo',schema:{$ref:'c'}}]"))
+ @RestMethod(method=GET,path="/path/{foo}/query",swagger=@MethodSwagger("parameters:[{'in':'query',name:'foo',schema:{$ref:'c'}}]"))
public X a() {
return null;
}
@@ -1780,12 +1780,12 @@ public class Swagger_Test {
@Rest
public static class O1a {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public void a(Value<O1c> foo) {}
}
@Rest
public static class O1b {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public O1c a() { return null;}
}
@Response(code=100)
@@ -1806,7 +1806,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{description:'a-100-description'}}}}}"))
public static class O2 {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public void a(@ResponseStatus Value<Integer> foo) {}
}
@@ -1818,7 +1818,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{description:'a-100-description'}}}}}"))
public static class O3 {
- @RestMethod(name=GET,path="/path/{foo}/responses/100",swagger=@MethodSwagger("responses:{100:{description:'b-100-description'}}"))
+ @RestMethod(method=GET,path="/path/{foo}/responses/100",swagger=@MethodSwagger("responses:{100:{description:'b-100-description'}}"))
public void a(@ResponseStatus Value<Integer> foo) {}
}
@@ -1830,12 +1830,12 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{description:'a-100-description'}}}}}"))
public static class O4a {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public void a(Value<O4c> foo) {}
}
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{description:'a-100-description'}}}}}"))
public static class O4b {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public O4c a() {return null;}
}
@Response(code=100,description="c-100-description")
@@ -1854,12 +1854,12 @@ public class Swagger_Test {
@Rest(messages="BasicRestInfoProviderTest", swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{description:'a-100-description'}}}}}"))
public static class O5a {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public void a(Value<O5c> foo) {}
}
@Rest(messages="BasicRestInfoProviderTest", swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{description:'a-100-description'}}}}}"))
public static class O5b {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public O5c a() {return null;}
}
@Response(code=100,description="$L{foo}")
@@ -1882,12 +1882,12 @@ public class Swagger_Test {
@Rest
public static class P1a {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public void a(Value<P1c> foo) {}
}
@Rest
public static class P1b {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public P1c a() {return null;}
}
@Response(code=100)
@@ -1908,7 +1908,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{headers:{'X-Foo':{description:'b-description',type:'integer',format:'int32'}}}}}}}"))
public static class P2 {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public X a(@ResponseStatus Value<Integer> foo) {
return null;
}
@@ -1922,7 +1922,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{headers:{'X-Foo':{description:'b-description',type:'integer',format:'int32'}}}}}}}"))
public static class P3 {
- @RestMethod(name=GET,path="/path/{foo}/responses/100",swagger=@MethodSwagger("responses:{100:{headers:{'X-Foo':{description:'c-description',type:'integer',format:'int32'}}}}"))
+ @RestMethod(method=GET,path="/path/{foo}/responses/100",swagger=@MethodSwagger("responses:{100:{headers:{'X-Foo':{description:'c-description',type:'integer',format:'int32'}}}}"))
public X a(@ResponseStatus Value<Integer> foo) {
return null;
}
@@ -1936,12 +1936,12 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{headers:{'X-Foo':{description:'b-description',type:'integer',format:'int32'}}}}}}}"))
public static class P4a {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public void a(Value<P4c> foo) {}
}
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{headers:{'X-Foo':{description:'b-description',type:'integer',format:'int32'}}}}}}}"))
public static class P4b {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public P4c a() {return null;}
}
@Response(code=100,headers=@ResponseHeader(name="X-Foo",description="d-description",type="integer",format="int32"))
@@ -1960,12 +1960,12 @@ public class Swagger_Test {
@Rest(messages="BasicRestInfoProviderTest", swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{headers:{'X-Foo':{description:'b-description',type:'integer',format:'int32'}}}}}}}"))
public static class P5a {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public void a(Value<P5c> foo) {}
}
@Rest(messages="BasicRestInfoProviderTest", swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{headers:{'X-Foo':{description:'b-description',type:'integer',format:'int32'}}}}}}}"))
public static class P5b {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public P5c a() {return null;}
}
@Response(code=100,headers=@ResponseHeader(name="X-Foo",description="$L{foo}",type="integer",format="int32"))
@@ -1988,12 +1988,12 @@ public class Swagger_Test {
@Rest
public static class Q1a {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public void a(Value<Q1c> foo) {}
}
@Rest
public static class Q1b {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public Q1c a() {return null;}
}
@Response(code=100)
@@ -2014,7 +2014,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{example:{foo:'b'}}}}}}"))
public static class Q2 {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public void a(@ResponseStatus Value<Integer> foo) {}
}
@@ -2026,7 +2026,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{example:{foo:'b'}}}}}}"))
public static class Q3 {
- @RestMethod(name=GET,path="/path/{foo}/responses/100",swagger=@MethodSwagger("responses:{100:{example:{foo:'c'}}}"))
+ @RestMethod(method=GET,path="/path/{foo}/responses/100",swagger=@MethodSwagger("responses:{100:{example:{foo:'c'}}}"))
public void a(@ResponseStatus Value<Integer> foo) {}
}
@@ -2038,12 +2038,12 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{example:{foo:'b'}}}}}}"))
public static class Q4a {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public void a(Value<Q4c> foo) {}
}
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{example:{foo:'b'}}}}}}"))
public static class Q4b {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public Q4c a() {return null;}
}
@Response(code=100,example="{foo:'d'}")
@@ -2064,12 +2064,12 @@ public class Swagger_Test {
@Rest(messages="BasicRestInfoProviderTest", swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{example:{foo:'b'}}}}}}"))
public static class Q5a {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public void a(Value<Q5c> foo) {}
}
@Rest(messages="BasicRestInfoProviderTest", swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{example:{foo:'b'}}}}}}"))
public static class Q5b {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public Q5c a() {return null;}
}
@Response(code=100,example="{foo:'$L{foo}'}")
@@ -2094,12 +2094,12 @@ public class Swagger_Test {
@Rest
public static class R1a {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public void a(Value<R1c> foo) {}
}
@Rest
public static class R1b {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public R1c a() {return null;}
}
@Response(code=100)
@@ -2120,7 +2120,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{examples:{foo:{bar:'b'}}}}}}}"))
public static class R2 {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public void a(@ResponseStatus Value<Integer> foo) {}
}
@@ -2132,7 +2132,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{examples:{foo:{bar:'b'}}}}}}}"))
public static class R3 {
- @RestMethod(name=GET,path="/path/{foo}/responses/100",swagger=@MethodSwagger("responses:{100:{examples:{foo:{bar:'c'}}}}"))
+ @RestMethod(method=GET,path="/path/{foo}/responses/100",swagger=@MethodSwagger("responses:{100:{examples:{foo:{bar:'c'}}}}"))
public void a(@ResponseStatus Value<Integer> foo) {}
}
@@ -2144,12 +2144,12 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{examples:{foo:{bar:'b'}}}}}}}"))
public static class R4a {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public void a(Value<R4c> foo) {}
}
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{examples:{foo:{bar:'b'}}}}}}}"))
public static class R4b {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public R4c a() {return null;}
}
@Response(code=100,examples="{foo:{bar:'d'}}")
@@ -2168,12 +2168,12 @@ public class Swagger_Test {
@Rest(messages="BasicRestInfoProviderTest", swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{examples:{foo:{bar:'b'}}}}}}}"))
public static class R5a {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public void a(Value<R5c> foo) {}
}
@Rest(messages="BasicRestInfoProviderTest", swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{examples:{foo:{bar:'b'}}}}}}}"))
public static class R5b {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public R5c a() {return null;}
}
@Response(code=100,examples="{foo:{bar:'$L{foo}'}}")
@@ -2196,12 +2196,12 @@ public class Swagger_Test {
@Rest
public static class S1a {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public void a(Value<S1c> foo) {}
}
@Rest
public static class S1b {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public S1c a() {return null;}
}
@Response(code=100)
@@ -2220,7 +2220,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{schema:{$ref:'b'}}}}}}"))
public static class S2 {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public void a(@ResponseStatus Value<Integer> foo) {}
}
@@ -2232,7 +2232,7 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{schema:{$ref:'b'}}}}}}"))
public static class S3 {
- @RestMethod(name=GET,path="/path/{foo}/responses/100",swagger=@MethodSwagger("responses:{100:{schema:{$ref:'c'}}}}"))
+ @RestMethod(method=GET,path="/path/{foo}/responses/100",swagger=@MethodSwagger("responses:{100:{schema:{$ref:'c'}}}}"))
public void a(@ResponseStatus Value<Integer> foo) {}
}
@@ -2244,12 +2244,12 @@ public class Swagger_Test {
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{schema:{$ref:'b'}}}}}}"))
public static class S4a {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public void a(Value<S4c> foo) {}
}
@Rest(swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{schema:{$ref:'b'}}}}}}"))
public static class S4b {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public S4c a() {return null;}
}
@Response(code=100,schema=@Schema($ref="d"))
@@ -2268,12 +2268,12 @@ public class Swagger_Test {
@Rest(messages="BasicRestInfoProviderTest", swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{schema:{$ref:'b'}}}}}}"))
public static class S5a {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public void a(Value<S5c> foo) {}
}
@Rest(messages="BasicRestInfoProviderTest", swagger=@ResourceSwagger("paths:{'/path/{foo}/responses/100':{get:{responses:{100:{schema:{$ref:'b'}}}}}}"))
public static class S5b {
- @RestMethod(name=GET,path="/path/{foo}/responses/100")
+ @RestMethod(method=GET,path="/path/{foo}/responses/100")
public S5c a() {return null;}
}
@Response(code=100,schema=@Schema("{$ref:'$L{foo}'}"))
@@ -2303,7 +2303,7 @@ public class Swagger_Test {
public static class T1 extends BasicRestServlet {
private static final long serialVersionUID = 1L;
- @RestMethod(name=GET,path="/")
+ @RestMethod(method=GET,path="/")
public T2 a(@Body T2 body) {
return null;
}
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/BeanConfig_Swaps_Test.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/BeanConfig_Swaps_Test.java
index 48cbb6a..5b8089e 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/BeanConfig_Swaps_Test.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/BeanConfig_Swaps_Test.java
@@ -95,11 +95,11 @@ public class BeanConfig_Swaps_Test {
public A a() {
return new A(); // Should return "A2-1".
}
- @RestMethod(name=PUT)
+ @RestMethod(method=PUT)
public A b(@Body A a) {
return a; // Should return "A2-1".
}
- @RestMethod(name=PUT, path="/c/{a}")
+ @RestMethod(method=PUT, path="/c/{a}")
public A c(@Path("a") A a) {
return a; // Should return "A2-1".
}
@@ -108,12 +108,12 @@ public class BeanConfig_Swaps_Test {
public A d() {
return new A(); // Should return "A3-1".
}
- @RestMethod(name=PUT)
+ @RestMethod(method=PUT)
@BeanConfig(swaps={SwapA3.class})
public A e(@Body A a) {
return a; // Should return "A3-1".
}
- @RestMethod(name=PUT, path="/f/{a}")
+ @RestMethod(method=PUT, path="/f/{a}")
@BeanConfig(swaps={SwapA3.class})
public A f(@Path("a") A a) {
return a; // Should return "A3-1".
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Body_Test.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Body_Test.java
index 21e6fd7..5c85f13 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Body_Test.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Body_Test.java
@@ -44,58 +44,58 @@ public class Body_Test {
@Rest(serializers=SimpleJsonSerializer.class, parsers=JsonParser.class, defaultAccept="text/json")
public static class A {
- @RestMethod(name=PUT, path="/String")
+ @RestMethod(method=PUT, path="/String")
public String a(@Body String b) {
return b;
}
- @RestMethod(name=PUT, path="/Integer")
+ @RestMethod(method=PUT, path="/Integer")
public Integer b(@Body Integer b) {
return b;
}
- @RestMethod(name=PUT, path="/int")
+ @RestMethod(method=PUT, path="/int")
public Integer c(@Body int b) {
return b;
}
- @RestMethod(name=PUT, path="/Boolean")
+ @RestMethod(method=PUT, path="/Boolean")
public Boolean d(@Body Boolean b) {
return b;
}
- @RestMethod(name=PUT, path="/boolean")
+ @RestMethod(method=PUT, path="/boolean")
public Boolean e(@Body boolean b) {
return b;
}
- @RestMethod(name=PUT, path="/float")
+ @RestMethod(method=PUT, path="/float")
public float f(@Body float f) {
return f;
}
- @RestMethod(name=PUT, path="/Float")
+ @RestMethod(method=PUT, path="/Float")
public Float g(@Body Float f) {
return f;
}
- @RestMethod(name=PUT, path="/Map")
+ @RestMethod(method=PUT, path="/Map")
public TreeMap<String,Integer> h(@Body TreeMap<String,Integer> m) {
return m;
}
- @RestMethod(name=PUT, path="/enum")
+ @RestMethod(method=PUT, path="/enum")
public TestEnum i(@Body TestEnum e) {
return e;
}
public static class A11 {
public String f1;
}
- @RestMethod(name=PUT, path="/Bean")
+ @RestMethod(method=PUT, path="/Bean")
public A11 j(@Body A11 b) {
return b;
}
- @RestMethod(name=PUT, path="/InputStream")
+ @RestMethod(method=PUT, path="/InputStream")
public String k(@Body InputStream b) throws Exception {
return IOUtils.read(b);
}
- @RestMethod(name=PUT, path="/Reader")
+ @RestMethod(method=PUT, path="/Reader")
public String l(@Body Reader b) throws Exception {
return IOUtils.read(b);
}
- @RestMethod(name=PUT, path="/InputStreamTransform")
+ @RestMethod(method=PUT, path="/InputStreamTransform")
public A14 m(@Body A14 b) throws Exception {
return b;
}
@@ -104,7 +104,7 @@ public class Body_Test {
public A14(InputStream in) throws Exception { this.s = IOUtils.read(in); }
@Override public String toString() { return s; }
}
- @RestMethod(name=PUT, path="/ReaderTransform")
+ @RestMethod(method=PUT, path="/ReaderTransform")
public A15 n(@Body A15 b) throws Exception {
return b;
}
@@ -113,7 +113,7 @@ public class Body_Test {
public A15(Reader in) throws Exception { this.s = IOUtils.read(in); }
@Override public String toString() { return s; }
}
- @RestMethod(name=PUT, path="/StringTransform")
+ @RestMethod(method=PUT, path="/StringTransform")
public A16 o(@Body A16 b) throws Exception { return b; }
public static class A16 {
private String s;
@@ -420,7 +420,7 @@ public class Body_Test {
@Rest(serializers=SimpleJsonSerializer.class, parsers=JsonParser.class, defaultAccept="application/json")
public static class B {
- @RestMethod(name=PUT, path="/StringTransform")
+ @RestMethod(method=PUT, path="/StringTransform")
public B1 a(B1 b) {
return b;
}
@@ -430,7 +430,7 @@ public class Body_Test {
public B1(String val) { this.val = val; }
@Override public String toString() { return val; }
}
- @RestMethod(name=PUT, path="/Bean")
+ @RestMethod(method=PUT, path="/Bean")
public B2 b(B2 b) {
return b;
}
@@ -438,14 +438,14 @@ public class Body_Test {
public static class B2 {
public String f1;
}
- @RestMethod(name=PUT, path="/BeanList")
+ @RestMethod(method=PUT, path="/BeanList")
public B3 c(B3 b) {
return b;
}
@SuppressWarnings("serial")
@Body
public static class B3 extends LinkedList<B2> {}
- @RestMethod(name=PUT, path="/InputStreamTransform")
+ @RestMethod(method=PUT, path="/InputStreamTransform")
public B4 d(B4 b) throws Exception {
return b;
}
@@ -455,7 +455,7 @@ public class Body_Test {
public B4(InputStream in) throws Exception { this.s = IOUtils.read(in); }
@Override public String toString() { return s; }
}
- @RestMethod(name=PUT, path="/ReaderTransform")
+ @RestMethod(method=PUT, path="/ReaderTransform")
public B5 e(B5 b) throws Exception {
return b;
}
@@ -511,19 +511,19 @@ public class Body_Test {
@Rest
public static class D {
- @RestMethod(name=PUT, path="/String")
+ @RestMethod(method=PUT, path="/String")
public Reader a(@Body Reader b) throws Exception {
return b;
}
- @RestMethod(name=PUT, path="/InputStream")
+ @RestMethod(method=PUT, path="/InputStream")
public InputStream b(@Body InputStream b) throws Exception {
return b;
}
- @RestMethod(name=PUT, path="/Reader")
+ @RestMethod(method=PUT, path="/Reader")
public Reader c(@Body Reader b) throws Exception {
return b;
}
- @RestMethod(name=PUT, path="/StringTransform")
+ @RestMethod(method=PUT, path="/StringTransform")
public Reader d(@Body D1 b) throws Exception {
return new StringReader(b.toString());
}
@@ -532,7 +532,7 @@ public class Body_Test {
public D1(String in) throws Exception { this.s = in; }
@Override public String toString() { return s; }
}
- @RestMethod(name=PUT, path="/InputStreamTransform")
+ @RestMethod(method=PUT, path="/InputStreamTransform")
public Reader e(@Body D2 b) throws Exception {
return new StringReader(b.toString());
}
@@ -541,7 +541,7 @@ public class Body_Test {
public D2(InputStream in) throws Exception { this.s = IOUtils.read(in); }
@Override public String toString() { return s; }
}
- @RestMethod(name=PUT, path="/ReaderTransform")
+ @RestMethod(method=PUT, path="/ReaderTransform")
public Reader f(@Body D3 b) throws Exception {
return new StringReader(b.toString());
}
@@ -550,7 +550,7 @@ public class Body_Test {
public D3(Reader in) throws Exception{ this.s = IOUtils.read(in); }
@Override public String toString() { return s; }
}
- @RestMethod(name=PUT, path="/StringTransformBodyOnPojo")
+ @RestMethod(method=PUT, path="/StringTransformBodyOnPojo")
public Reader g(D4 b) throws Exception {
return new StringReader(b.toString());
}
@@ -560,7 +560,7 @@ public class Body_Test {
public D4(String in) throws Exception { this.s = in; }
@Override public String toString() { return s; }
}
- @RestMethod(name=PUT, path="/InputStreamTransformBodyOnPojo")
+ @RestMethod(method=PUT, path="/InputStreamTransformBodyOnPojo")
public Reader h(D5 b) throws Exception {
return new StringReader(b.toString());
}
@@ -571,7 +571,7 @@ public class Body_Test {
@Override public String toString() { return s; }
}
- @RestMethod(name=PUT, path="/ReaderTransformBodyOnPojo")
+ @RestMethod(method=PUT, path="/ReaderTransformBodyOnPojo")
public Reader i(D6 b) throws Exception {
return new StringReader(b.toString());
}
@@ -648,11 +648,11 @@ public class Body_Test {
@Rest(serializers=SimpleJsonSerializer.class, parsers=JsonParser.class, defaultAccept="application/json")
public static class E {
- @RestMethod(name=PUT, path="/B")
+ @RestMethod(method=PUT, path="/B")
public XBeans.XB a(@Body XBeans.XB b) {
return b;
}
- @RestMethod(name=PUT, path="/C")
+ @RestMethod(method=PUT, path="/C")
public XBeans.XC b(@Body XBeans.XC c) {
return c;
}
@@ -688,11 +688,11 @@ public class Body_Test {
@Bean(on="A,B,C",sort=true)
@UrlEncoding(on="C",expandedParams=true)
public static class E2 {
- @RestMethod(name=PUT, path="/B")
+ @RestMethod(method=PUT, path="/B")
public XBeans.XE a(@Body XBeans.XE b) {
return b;
}
- @RestMethod(name=PUT, path="/C")
+ @RestMethod(method=PUT, path="/C")
public XBeans.XF b(@Body XBeans.XF c) {
return c;
}
@@ -730,7 +730,7 @@ public class Body_Test {
@Rest(serializers=JsonSerializer.class,parsers=JsonParser.class)
public static class F {
- @RestMethod(name=POST, path="/*")
+ @RestMethod(method=POST, path="/*")
public Reader a(
@Body F1 bean,
@HasQuery("p1") boolean hqp1, @HasQuery("p2") boolean hqp2,
@@ -768,7 +768,7 @@ public class Body_Test {
@Rest(serializers=UrlEncodingSerializer.class,parsers=UrlEncodingParser.class)
public static class G {
- @RestMethod(name=POST,path="/")
+ @RestMethod(method=POST,path="/")
public XBeans.XC a(@Body XBeans.XC content) throws Exception {
return content;
}
@@ -811,7 +811,7 @@ public class Body_Test {
@Rest(serializers=UrlEncodingSerializer.class,parsers=UrlEncodingParser.class)
public static class H {
- @RestMethod(name=POST,path="/",
+ @RestMethod(method=POST,path="/",
properties={
@Property(name=UrlEncodingSerializer.URLENC_expandedParams, value="true"),
@Property(name=UrlEncodingParser.URLENC_expandedParams, value="true")
@@ -855,7 +855,7 @@ public class Body_Test {
@Bean(on="A,B,C",sort=true)
@UrlEncoding(on="C",expandedParams=true)
public static class H2 {
- @RestMethod(name=POST,path="/",
+ @RestMethod(method=POST,path="/",
properties={
@Property(name=UrlEncodingSerializer.URLENC_expandedParams, value="true"),
@Property(name=UrlEncodingParser.URLENC_expandedParams, value="true")
@@ -901,11 +901,11 @@ public class Body_Test {
@Rest(serializers=JsonSerializer.class,parsers=JsonParser.class)
public static class I {
- @RestMethod(name=POST)
+ @RestMethod(method=POST)
public XBeans.XB a(@Body(r=true) XBeans.XB content) throws Exception {
return content;
}
- @RestMethod(name=POST)
+ @RestMethod(method=POST)
@Bean(on="A,B,C",sort=true)
@UrlEncoding(on="C",expandedParams=true)
public XBeans.XE b(@Body(r=true) XBeans.XE content) throws Exception {
@@ -940,22 +940,22 @@ public class Body_Test {
@Rest(serializers=SimpleJsonSerializer.class,parsers=JsonParser.class)
public static class J {
- @RestMethod(name=POST)
+ @RestMethod(method=POST)
public Object a(@Body Optional<Integer> body) throws Exception {
assertNotNull(body);
return body;
}
- @RestMethod(name=POST)
+ @RestMethod(method=POST)
public Object b(@Body Optional<ABean> body) throws Exception {
assertNotNull(body);
return body;
}
- @RestMethod(name=POST)
+ @RestMethod(method=POST)
public Object c(@Body Optional<List<ABean>> body) throws Exception {
assertNotNull(body);
return body;
}
- @RestMethod(name=POST)
+ @RestMethod(method=POST)
public Object d(@Body List<Optional<ABean>> body) throws Exception {
return body;
}
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/FormData_Test.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/FormData_Test.java
index c7d3784..4a9740f 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/FormData_Test.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/FormData_Test.java
@@ -68,12 +68,12 @@ public class FormData_Test {
@Rest
public static class B {
- @RestMethod(name=POST)
+ @RestMethod(method=POST)
public String a(RestRequest req, @FormData(value="p1") String p1) throws Exception {
RequestFormData f = req.getFormData();
return "p1=["+p1+","+req.getFormData().getString("p1")+","+f.get("p1", String.class)+"]";
}
- @RestMethod(name=POST)
+ @RestMethod(method=POST)
public String b(RestRequest req, @FormData(value="p1",format="uon") String p1) throws Exception {
RequestFormData f = req.getFormData();
return "p1=["+p1+","+req.getFormData().getString("p1")+","+f.get("p1", String.class)+"]";
@@ -97,28 +97,28 @@ public class FormData_Test {
@Rest
public static class C {
- @RestMethod(name=POST, defaultFormData={"f1:1","f2=2"," f3 : 3 "})
+ @RestMethod(method=POST, defaultFormData={"f1:1","f2=2"," f3 : 3 "})
public OMap a(RequestFormData formData) {
return OMap.of()
.a("f1", formData.getString("f1"))
.a("f2", formData.getString("f2"))
.a("f3", formData.getString("f3"));
}
- @RestMethod(name=POST)
+ @RestMethod(method=POST)
public OMap b(@FormData("f1") String f1, @FormData("f2") String f2, @FormData("f3") String f3) {
return OMap.of()
.a("f1", f1)
.a("f2", f2)
.a("f3", f3);
}
- @RestMethod(name=POST)
+ @RestMethod(method=POST)
public OMap c(@FormData(value="f1",_default="1") String f1, @FormData(value="f2",_default="2") String f2, @FormData(value="f3",_default="3") String f3) {
return OMap.of()
.a("f1", f1)
.a("f2", f2)
.a("f3", f3);
}
- @RestMethod(name=POST, defaultFormData={"f1:1","f2=2"," f3 : 3 "})
+ @RestMethod(method=POST, defaultFormData={"f1:1","f2=2"," f3 : 3 "})
public OMap d(@FormData(value="f1",_default="4") String f1, @FormData(value="f2",_default="5") String f2, @FormData(value="f3",_default="6") String f3) {
return OMap.of()
.a("f1", f1)
@@ -150,22 +150,22 @@ public class FormData_Test {
@Rest(serializers=SimpleJsonSerializer.class)
public static class D {
- @RestMethod(name=POST)
+ @RestMethod(method=POST)
public Object a(@FormData("f1") Optional<Integer> f1) throws Exception {
assertNotNull(f1);
return f1;
}
- @RestMethod(name=POST)
+ @RestMethod(method=POST)
public Object b(@FormData("f1") Optional<ABean> f1) throws Exception {
assertNotNull(f1);
return f1;
}
- @RestMethod(name=POST)
+ @RestMethod(method=POST)
public Object c(@FormData("f1") Optional<List<ABean>> f1) throws Exception {
assertNotNull(f1);
return f1;
}
- @RestMethod(name=POST)
+ @RestMethod(method=POST)
public Object d(@FormData("f1") List<Optional<ABean>> f1) throws Exception {
return f1;
}
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HasQuery_Test.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HasQuery_Test.java
index ea47772..0655cd2 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HasQuery_Test.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HasQuery_Test.java
@@ -36,7 +36,7 @@ public class HasQuery_Test {
RequestQuery q = req.getQuery();
return "p1=["+p1+","+q.containsKey("p1")+"],p2=["+p2+","+q.containsKey("p2")+"]";
}
- @RestMethod(name=POST)
+ @RestMethod(method=POST)
public String b(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")+"]";
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/PathRemainder_Test.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/PathRemainder_Test.java
index 5b2020a..b0d12df 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/PathRemainder_Test.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/PathRemainder_Test.java
@@ -34,7 +34,7 @@ public class PathRemainder_Test {
@Rest
public static class A {
- @RestMethod(name=GET, path="/*")
+ @RestMethod(method=GET, path="/*")
public String a(@Path("/*") String remainder) {
return remainder;
}
@@ -54,22 +54,22 @@ public class PathRemainder_Test {
@Rest(serializers=SimpleJsonSerializer.class)
public static class B {
- @RestMethod(name=GET,path="/a/*")
+ @RestMethod(method=GET,path="/a/*")
public Object a(@Path("/*") Optional<Integer> f1) throws Exception {
assertNotNull(f1);
return f1;
}
- @RestMethod(name=GET,path="/b/*")
+ @RestMethod(method=GET,path="/b/*")
public Object b(@Path("/*") Optional<ABean> f1) throws Exception {
assertNotNull(f1);
return f1;
}
- @RestMethod(name=GET,path="/c/*")
+ @RestMethod(method=GET,path="/c/*")
public Object c(@Path("/*") Optional<List<ABean>> f1) throws Exception {
assertNotNull(f1);
return f1;
}
- @RestMethod(name=GET,path="/d/*")
+ @RestMethod(method=GET,path="/d/*")
public Object d(@Path("/*") List<Optional<ABean>> f1) throws Exception {
return f1;
}
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Path_Test.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Path_Test.java
index 2c29343..efc2aab 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Path_Test.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Path_Test.java
@@ -38,23 +38,23 @@ public class Path_Test {
@Rest
public static class A {
- @RestMethod(name=GET, path="/")
+ @RestMethod(method=GET, path="/")
public void a(RestResponse res) {
res.setOutput(GET);
}
- @RestMethod(name=GET, path="/a")
+ @RestMethod(method=GET, path="/a")
public String b() {
return "GET /a";
}
- @RestMethod(name=GET, path="/a/{foo}")
+ @RestMethod(method=GET, path="/a/{foo}")
public String c(RestResponse res, @Path("foo") String foo) {
return "GET /a " + foo;
}
- @RestMethod(name=GET, path="/a/{foo}/{bar}")
+ @RestMethod(method=GET, path="/a/{foo}/{bar}")
public String d(RestResponse res, @Path("foo") String foo, @Path("bar") String bar) {
return "GET /a " + foo + "," + bar;
}
- @RestMethod(name=GET, path="/a/{foo}/{bar}/*")
+ @RestMethod(method=GET, path="/a/{foo}/{bar}/*")
public String e(@Path("foo") String foo, @Path("bar") int bar, @Path("/*") String remainder) {
return "GET /a "+foo+","+bar+",r="+remainder;
}
@@ -109,35 +109,35 @@ public class Path_Test {
@Rest
public static class B {
- @RestMethod(name=GET, path="/a/{x}/foo")
+ @RestMethod(method=GET, path="/a/{x}/foo")
public String a(@Path("x") int x) {
return String.valueOf(x);
}
- @RestMethod(name=GET, path="/b/{x}/foo")
+ @RestMethod(method=GET, path="/b/{x}/foo")
public String b(@Path("x") short x) {
return String.valueOf(x);
}
- @RestMethod(name=GET, path="/c/{x}/foo")
+ @RestMethod(method=GET, path="/c/{x}/foo")
public String c(@Path("x") long x) {
return String.valueOf(x);
}
- @RestMethod(name=GET, path="/d/{x}/foo")
+ @RestMethod(method=GET, path="/d/{x}/foo")
public String d(@Path("x") char x) {
return String.valueOf(x);
}
- @RestMethod(name=GET, path="/e/{x}/foo")
+ @RestMethod(method=GET, path="/e/{x}/foo")
public String e(@Path("x") float x) {
return String.valueOf(x);
}
- @RestMethod(name=GET, path="/f/{x}/foo")
+ @RestMethod(method=GET, path="/f/{x}/foo")
public String f(@Path("x") double x) {
return String.valueOf(x);
}
- @RestMethod(name=GET, path="/g/{x}/foo")
+ @RestMethod(method=GET, path="/g/{x}/foo")
public String g(@Path("x") byte x) {
return String.valueOf(x);
}
- @RestMethod(name=GET, path="/h/{x}/foo")
+ @RestMethod(method=GET, path="/h/{x}/foo")
public String h(@Path("x") boolean x) {
return String.valueOf(x);
}
@@ -210,35 +210,35 @@ public class Path_Test {
@Rest
public static class C {
- @RestMethod(name=GET, path="/a/{x}/foo")
+ @RestMethod(method=GET, path="/a/{x}/foo")
public String a(@Path("x") Integer x) {
return String.valueOf(x);
}
- @RestMethod(name=GET, path="/b/{x}/foo")
+ @RestMethod(method=GET, path="/b/{x}/foo")
public String b(@Path("x") Short x) {
return String.valueOf(x);
}
- @RestMethod(name=GET, path="/c/{x}/foo")
+ @RestMethod(method=GET, path="/c/{x}/foo")
public String c(@Path("x") Long x) {
return String.valueOf(x);
}
- @RestMethod(name=GET, path="/d/{x}/foo")
+ @RestMethod(method=GET, path="/d/{x}/foo")
public String d(@Path("x") Character x) {
return String.valueOf(x);
}
- @RestMethod(name=GET, path="/e/{x}/foo")
+ @RestMethod(method=GET, path="/e/{x}/foo")
public String e(@Path("x") Float x) {
return String.valueOf(x);
}
- @RestMethod(name=GET, path="/f/{x}/foo")
+ @RestMethod(method=GET, path="/f/{x}/foo")
public String f(@Path("x") Double x) {
return String.valueOf(x);
}
- @RestMethod(name=GET, path="/g/{x}/foo")
+ @RestMethod(method=GET, path="/g/{x}/foo")
public String g(@Path("x") Byte x) {
return String.valueOf(x);
}
- @RestMethod(name=GET, path="/h/{x}/foo")
+ @RestMethod(method=GET, path="/h/{x}/foo")
public String h(@Path("x") Boolean x) {
return String.valueOf(x);
}
@@ -312,7 +312,7 @@ public class Path_Test {
@Rest
public static class D {
// Object with forString(String) method
- @RestMethod(name=GET, path="/a/{uuid}")
+ @RestMethod(method=GET, path="/a/{uuid}")
public UUID a(RestResponse res, @Path("uuid") UUID uuid) {
return uuid;
}
@@ -334,23 +334,23 @@ public class Path_Test {
@Rest
public static class E {
- @RestMethod(name=GET, path="/x/{foo}/{bar}")
+ @RestMethod(method=GET, path="/x/{foo}/{bar}")
public Object a(@Path String foo, @Path String bar) {
return OMap.of("m", "normal1", "foo", foo, "bar", bar);
}
- @RestMethod(name=GET, path="/x/{foo}/x/{bar}/x")
+ @RestMethod(method=GET, path="/x/{foo}/x/{bar}/x")
public Object b(@Path String foo, @Path String bar) {
return OMap.of("m", "normal2", "foo", foo, "bar", bar);
}
- @RestMethod(name=GET, path="/y/{0}/{1}")
+ @RestMethod(method=GET, path="/y/{0}/{1}")
public Object c(@Path String foo, @Path String bar) {
return OMap.of("m", "numbers1", "0", foo, "1", bar);
}
- @RestMethod(name=GET, path="/y/{0}/y/{1}/y")
+ @RestMethod(method=GET, path="/y/{0}/y/{1}/y")
public Object d(@Path String foo, @Path String bar) {
return OMap.of("m", "numbers2", "0", foo, "1", bar);
}
- @RestMethod(name=GET, path="/z/{1}/z/{0}/z")
+ @RestMethod(method=GET, path="/z/{1}/z/{0}/z")
public Object e(@Path String foo, @Path String bar) {
return OMap.of("m", "numbers3", "0", foo, "1", bar);
}
@@ -382,27 +382,27 @@ public class Path_Test {
@Rest(path="/f/{a}/{b}")
public static class F {
- @RestMethod(name=GET, path="/")
+ @RestMethod(method=GET, path="/")
public String a(RequestPath path) {
return format("a: {0}", path);
}
- @RestMethod(name=GET, path="/*")
+ @RestMethod(method=GET, path="/*")
public String b(RequestPath path) {
return format("b: {0}", path);
}
- @RestMethod(name=GET, path="/fc")
+ @RestMethod(method=GET, path="/fc")
public String c(RequestPath path) {
return format("c: {0}", path);
}
- @RestMethod(name=GET, path="/fd/{c}/{d}")
+ @RestMethod(method=GET, path="/fd/{c}/{d}")
public String d(RequestPath path) {
return format("d: {0}", path);
}
- @RestMethod(name=GET, path="/fe/{a}/{b}")
+ @RestMethod(method=GET, path="/fe/{a}/{b}")
public String e(RequestPath path) {
return format("e: {0}", path);
}
- @RestMethod(name=GET, path="/ff/{c}/{d}/*")
+ @RestMethod(method=GET, path="/ff/{c}/{d}/*")
public String f(RequestPath path) {
return format("f: {0}", path);
}
@@ -745,22 +745,22 @@ public class Path_Test {
@Rest(serializers=SimpleJsonSerializer.class)
public static class J {
- @RestMethod(name=GET,path="/a/{f1}")
+ @RestMethod(method=GET,path="/a/{f1}")
public Object a(@Path("f1") Optional<Integer> f1) throws Exception {
assertNotNull(f1);
return f1;
}
- @RestMethod(name=GET,path="/b/{f1}")
+ @RestMethod(method=GET,path="/b/{f1}")
public Object b(@Path("f1") Optional<ABean> f1) throws Exception {
assertNotNull(f1);
return f1;
}
- @RestMethod(name=GET,path="/c/{f1}")
+ @RestMethod(method=GET,path="/c/{f1}")
public Object c(@Path("f1") Optional<List<ABean>> f1) throws Exception {
assertNotNull(f1);
return f1;
}
- @RestMethod(name=GET,path="/d/{f1}")
+ @RestMethod(method=GET,path="/d/{f1}")
public Object d(@Path("f1") List<Optional<ABean>> f1) throws Exception {
return f1;
}
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Query_Test.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Query_Test.java
index acaaf3e..4e61810 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Query_Test.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Query_Test.java
@@ -97,12 +97,12 @@ public class Query_Test {
RequestQuery q = req.getQuery();
return "p1=["+p1+","+req.getQuery().getString("p1")+","+q.get("p1", String.class)+"]";
}
- @RestMethod(name=POST)
+ @RestMethod(method=POST)
public String c(RestRequest req, @Query(n="p1") String p1) throws Exception {
RequestQuery q = req.getQuery();
return "p1=["+p1+","+req.getQuery().getString("p1")+","+q.get("p1", String.class)+"]";
}
- @RestMethod(name=POST)
+ @RestMethod(method=POST)
public String d(RestRequest req, @Query(n="p1",f="uon") String p1) throws Exception {
RequestQuery q = req.getQuery();
return "p1=["+p1+","+req.getQuery().getString("p1")+","+q.get("p1", String.class)+"]";
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestHook_Test.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestHook_Test.java
index e4e8a5b..dbdc25b 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestHook_Test.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestHook_Test.java
@@ -64,7 +64,7 @@ public class RestHook_Test {
req.getHeaders().put("Content-Type", overrideContentType);
}
- @RestMethod(name=PUT,
+ @RestMethod(method=PUT,
reqAttrs={
"p3:mp3",
"p4:mp4"
@@ -74,7 +74,7 @@ public class RestHook_Test {
return in;
}
- @RestMethod(name=PUT)
+ @RestMethod(method=PUT)
public String b(RestRequest req, RequestAttributes attrs) throws Exception {
attrs.put("p3", "pp3");
attrs.put("p4", "pp4");
@@ -136,7 +136,7 @@ public class RestHook_Test {
attrs.put("Override-Content-Type", overrideContentType);
}
- @RestMethod(name=PUT,
+ @RestMethod(method=PUT,
reqAttrs={
"p3:mp3",
"p4:mp4"
@@ -147,7 +147,7 @@ public class RestHook_Test {
return null;
}
- @RestMethod(name=PUT)
+ @RestMethod(method=PUT)
public String b(RestRequest req, RequestAttributes attrs) throws Exception {
attrs.put("p3", "pp3");
attrs.put("p4", "pp4");
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestMethodAnnotation_Test.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestMethodAnnotation_Test.java
index 98bb31d..8b31d7c 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestMethodAnnotation_Test.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestMethodAnnotation_Test.java
@@ -51,7 +51,6 @@ public class RestMethodAnnotation_Test {
.matchers(RestMatcher.class)
.maxInput("maxInput")
.method("method")
- .name("name")
.on("on")
.parsers(Parser.class)
.path("path")
@@ -86,7 +85,6 @@ public class RestMethodAnnotation_Test {
.matchers(RestMatcher.class)
.maxInput("maxInput")
.method("method")
- .name("name")
.on("on")
.parsers(Parser.class)
.path("path")
@@ -124,7 +122,6 @@ public class RestMethodAnnotation_Test {
+ "matchers:['org.apache.juneau.rest.RestMatcher'],"
+ "maxInput:'maxInput',"
+ "method:'method',"
- + "name:'name',"
+ "on:['on'],"
+ "parsers:['org.apache.juneau.parser.Parser'],"
+ "path:'path',"
@@ -202,7 +199,6 @@ public class RestMethodAnnotation_Test {
matchers=RestMatcher.class,
maxInput="maxInput",
method="method",
- name="name",
on="on",
parsers=Parser.class,
path="path",
@@ -239,7 +235,6 @@ public class RestMethodAnnotation_Test {
matchers=RestMatcher.class,
maxInput="maxInput",
method="method",
- name="name",
on="on",
parsers=Parser.class,
path="path",
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestMethod_ClientVersion_Test.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestMethod_ClientVersion_Test.java
index 51ad653..4771940 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestMethod_ClientVersion_Test.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestMethod_ClientVersion_Test.java
@@ -28,23 +28,23 @@ public class RestMethod_ClientVersion_Test {
@Rest
public static class A {
- @RestMethod(name=GET, path="/")
+ @RestMethod(method=GET, path="/")
public String a() {
return "no-version";
}
- @RestMethod(name=GET, path="/", clientVersion="[0.0,1.0)")
+ @RestMethod(method=GET, path="/", clientVersion="[0.0,1.0)")
public String b() {
return "[0.0,1.0)";
}
- @RestMethod(name=GET, path="/", clientVersion="[1.0,1.0]")
+ @RestMethod(method=GET, path="/", clientVersion="[1.0,1.0]")
public String c() {
return "[1.0,1.0]";
}
- @RestMethod(name=GET, path="/", clientVersion="[1.1,2)")
+ @RestMethod(method=GET, path="/", clientVersion="[1.1,2)")
public String d() {
return "[1.1,2)";
}
- @RestMethod(name=GET, path="/", clientVersion="2")
+ @RestMethod(method=GET, path="/", clientVersion="2")
public String e() {
return "2";
}
@@ -71,23 +71,23 @@ public class RestMethod_ClientVersion_Test {
@Rest(clientVersionHeader="Custom-Client-Version")
public static class B {
- @RestMethod(name=GET, path="/")
+ @RestMethod(method=GET, path="/")
public String a() {
return "no-version";
}
- @RestMethod(name=GET, path="/", clientVersion="[0.0,1.0)")
+ @RestMethod(method=GET, path="/", clientVersion="[0.0,1.0)")
public String b() {
return "[0.0,1.0)";
}
- @RestMethod(name=GET, path="/", clientVersion="[1.0,1.0]")
+ @RestMethod(method=GET, path="/", clientVersion="[1.0,1.0]")
public String c() {
return "[1.0,1.0]";
}
- @RestMethod(name=GET, path="/", clientVersion="[1.1,2)")
+ @RestMethod(method=GET, path="/", clientVersion="[1.1,2)")
public String d() {
return "[1.1,2)";
}
- @RestMethod(name=GET, path="/", clientVersion="2")
+ @RestMethod(method=GET, path="/", clientVersion="2")
public String e() {
return "2";
}
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestMethod_Matchers_Test.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestMethod_Matchers_Test.java
index ae4e598..09a1e77 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestMethod_Matchers_Test.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestMethod_Matchers_Test.java
@@ -30,23 +30,23 @@ public class RestMethod_Matchers_Test {
@Rest
public static class A {
- @RestMethod(name=GET, path="/one", matchers=A1.class)
+ @RestMethod(method=GET, path="/one", matchers=A1.class)
public String a() {
return "OK-1a";
}
- @RestMethod(name=GET, path="/one", matchers=A2.class)
+ @RestMethod(method=GET, path="/one", matchers=A2.class)
public String b() {
return "OK-1b";
}
- @RestMethod(name=GET, path="/one")
+ @RestMethod(method=GET, path="/one")
public String c() {
return "OK-1c";
}
- @RestMethod(name=GET, path="/two")
+ @RestMethod(method=GET, path="/two")
public String d() {
return "OK-2a";
}
- @RestMethod(name=GET, path="/two", matchers={A1.class, A2.class})
+ @RestMethod(method=GET, path="/two", matchers={A1.class, A2.class})
public String e() {
return "OK-2b";
}
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedMethodHeaders_Test.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedMethodHeaders_Test.java
index 2f4282c..2fd7118 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedMethodHeaders_Test.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedMethodHeaders_Test.java
@@ -33,7 +33,7 @@ public class Rest_AllowedMethodHeaders_Test {
public String put() {
return "PUT";
}
- @RestMethod(name="foo",path="/")
+ @RestMethod(method="foo",path="/")
public String foo() {
return "FOO";
}
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedMethodParams_Test.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedMethodParams_Test.java
index 4fe71c9..2cf7310 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedMethodParams_Test.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedMethodParams_Test.java
@@ -43,7 +43,7 @@ public class Rest_AllowedMethodParams_Test {
public String options() {
return "OPTIONS";
}
- @RestMethod(name="foo",path="/")
+ @RestMethod(method="foo",path="/")
public String foo() {
return "FOO";
}
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AnnotationInheritance_Test.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AnnotationInheritance_Test.java
index a8d3425..309d17d 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AnnotationInheritance_Test.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AnnotationInheritance_Test.java
@@ -32,11 +32,11 @@ public class Rest_AnnotationInheritance_Test {
@Rest(serializers=SimpleJsonSerializer.class, parsers=JsonParser.class, defaultAccept="text/json")
public static interface IA {
- @RestMethod(name=PUT)
+ @RestMethod(method=PUT)
public String a(@Body String b);
- @RestMethod(name=GET)
+ @RestMethod(method=GET)
public String b(@Query("foo") String b);
- @RestMethod(name=GET)
+ @RestMethod(method=GET)
public String c(@Header("foo") String b);
}
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_RVars_Test.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_RVars_Test.java
index 7aec687..00d8156 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_RVars_Test.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_RVars_Test.java
@@ -50,7 +50,7 @@ public class Rest_RVars_Test {
)
public static class A {
- @RestMethod(name=GET, path="/p2",
+ @RestMethod(method=GET, path="/p2",
reqAttrs={"B1: b1", "B2:b"},
serializers=A1.class
)
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_Parsers_Test.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_Parsers_Test.java
index 1579528..b2aa705 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_Parsers_Test.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Restx_Parsers_Test.java
@@ -105,23 +105,23 @@ public class Restx_Parsers_Test {
@Rest(parsers=PA.class)
public static class A {
- @RestMethod(name=PUT)
+ @RestMethod(method=PUT)
public String a(@Body String in) {
return in;
}
- @RestMethod(name=PUT, parsers=PB.class)
+ @RestMethod(method=PUT, parsers=PB.class)
public String b(@Body String in) {
return in;
}
- @RestMethod(name=PUT, parsers={Inherit.class, PB.class,PC.class})
+ @RestMethod(method=PUT, parsers={Inherit.class, PB.class,PC.class})
public String c(@Body String in) {
return in;
}
- @RestMethod(name=PUT, parsers={Inherit.class, PD.class})
+ @RestMethod(method=PUT, parsers={Inherit.class, PD.class})
public String d(@Body String in) {
return in;
}
- @RestMethod(name=PUT)
+ @RestMethod(method=PUT)
public String e(@Body String in) {
return in;
}
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Path_Test.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Path_Test.java
index 3a9a7fd..d9177b6 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Path_Test.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Path_Test.java
@@ -48,7 +48,7 @@ public class Swagger_Path_Test {
return "a";
}
}
- @RestMethod(name=GET,path="/a/{P}")
+ @RestMethod(method=GET,path="/a/{P}")
public void a(A1 f) {}
@Path(
@@ -67,7 +67,7 @@ public class Swagger_Path_Test {
return "b";
}
}
- @RestMethod(name=GET,path="/b/{P}")
+ @RestMethod(method=GET,path="/b/{P}")
public void b(A2 f) {}
@Path(
@@ -90,7 +90,7 @@ public class Swagger_Path_Test {
return "c";
}
}
- @RestMethod(name=GET,path="/c/{P}")
+ @RestMethod(method=GET,path="/c/{P}")
public void c(A3 f) {}
@@ -101,7 +101,7 @@ public class Swagger_Path_Test {
return "d";
}
}
- @RestMethod(name=GET,path="/d/{P}")
+ @RestMethod(method=GET,path="/d/{P}")
public void d(A4 f) {}
@Path(n="P",e={" ['a','b'] "})
@@ -111,7 +111,7 @@ public class Swagger_Path_Test {
return "e";
}
}
- @RestMethod(name=GET,path="/e/{P}")
+ @RestMethod(method=GET,path="/e/{P}")
public void e(A5 f) {}
}
@@ -158,26 +158,26 @@ public class Swagger_Path_Test {
@Path(n="P")
public static class B1 {}
- @RestMethod(name=GET,path="/a/{P}")
+ @RestMethod(method=GET,path="/a/{P}")
public void a(B1 f) {}
@Path("P")
public static class B2 {
public String f1;
}
- @RestMethod(name=GET,path="/b/{P}")
+ @RestMethod(method=GET,path="/b/{P}")
public void b(B2 b) {}
@Path("P")
public static class B3 extends LinkedList<String> {
private static final long serialVersionUID = 1L;
}
- @RestMethod(name=GET,path="/c/{P}")
+ @RestMethod(method=GET,path="/c/{P}")
public void c(B3 b) {}
@Path("P")
public static class B4 {}
- @RestMethod(name=GET,path="/d/{P}")
+ @RestMethod(method=GET,path="/d/{P}")
public void d(B4 b) {}
}
@@ -206,7 +206,7 @@ public class Swagger_Path_Test {
public static class C1 {
public String f1;
}
- @RestMethod(name=GET,path="/a/{P}")
+ @RestMethod(method=GET,path="/a/{P}")
public void a(C1 f) {}
}
@@ -221,14 +221,14 @@ public class Swagger_Path_Test {
@Rest
public static class D {
- @RestMethod(name=GET,path="/a/{P}")
+ @RestMethod(method=GET,path="/a/{P}")
public void a(@Path(
n="P",
d="a",
t="string"
) String h) {}
- @RestMethod(name=GET,path="/b/{P}")
+ @RestMethod(method=GET,path="/b/{P}")
public void b(@Path(
n="P",
api={
@@ -237,7 +237,7 @@ public class Swagger_Path_Test {
}
) String h) {}
- @RestMethod(name=GET,path="/c/{P}")
+ @RestMethod(method=GET,path="/c/{P}")
public void c(@Path(
n="P",
api={
@@ -248,10 +248,10 @@ public class Swagger_Path_Test {
t="string"
) String h) {}
- @RestMethod(name=GET,path="/d/{P}")
+ @RestMethod(method=GET,path="/d/{P}")
public void d(@Path("P") String h) {}
- @RestMethod(name=GET,path="/e/{P}")
+ @RestMethod(method=GET,path="/e/{P}")
public void e(@Path(n="P",e={" ['a','b'] "}) String h) {}
}
@@ -282,29 +282,29 @@ public class Swagger_Path_Test {
@Rest
public static class E {
- @RestMethod(name=GET,path="/a/{P}")
+ @RestMethod(method=GET,path="/a/{P}")
public void a(@Path("P") String h) {}
public static class E2 {
public String f1;
}
- @RestMethod(name=GET,path="/b/{P}")
+ @RestMethod(method=GET,path="/b/{P}")
public void b(@Path("P") E2 b) {}
public static class E3 extends LinkedList<String> {
private static final long serialVersionUID = 1L;
}
- @RestMethod(name=GET,path="/c/{P}")
+ @RestMethod(method=GET,path="/c/{P}")
public void c(@Path("P") E3 b) {}
public static class E4 {}
- @RestMethod(name=GET,path="/d/{P}")
+ @RestMethod(method=GET,path="/d/{P}")
public void d(@Path("P") E4 b) {}
- @RestMethod(name=GET,path="/e/{P}")
+ @RestMethod(method=GET,path="/e/{P}")
public void e(@Path("P") Integer b) {}
- @RestMethod(name=GET,path="/f/{P}")
+ @RestMethod(method=GET,path="/f/{P}")
public void f(@Path("P") Boolean b) {}
}
@@ -335,7 +335,7 @@ public class Swagger_Path_Test {
@Rest
public static class F {
- @RestMethod(name=GET,path="/a/{P}")
+ @RestMethod(method=GET,path="/a/{P}")
public void a(@Path(n="P",ex="{f1:'b'}") String h) {}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestGroup.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestGroup.java
index b8b420f..352732d 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestGroup.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestGroup.java
@@ -35,7 +35,7 @@ public abstract class BasicRestGroup extends BasicRest {
* @param req The HTTP request.
* @return The bean containing links to the child resources.
*/
- @RestMethod(name=GET, path="/", summary="Navigation page")
+ @RestMethod(method=GET, path="/", summary="Navigation page")
public ChildResourceDescriptions getChildren(RestRequest req) {
return new ChildResourceDescriptions(req);
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestMethods.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestMethods.java
index 745ec27..a269539 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestMethods.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestMethods.java
@@ -60,7 +60,7 @@ public interface BasicRestMethods {
* @param req The HTTP request.
* @return A bean containing the contents for the OPTIONS page.
*/
- @RestMethod(name=OPTIONS, path="/*",
+ @RestMethod(method=OPTIONS, path="/*",
summary="Swagger documentation",
description="Swagger documentation for this resource."
)
@@ -83,7 +83,7 @@ public interface BasicRestMethods {
* @param req The HTTP request.
* @return A bean containing the contents for the OPTIONS page.
*/
- @RestMethod(name=OPTIONS, path="/*",
+ @RestMethod(method=OPTIONS, path="/*",
summary="Swagger documentation",
description="Swagger documentation for this resource."
)
@@ -111,7 +111,7 @@ public interface BasicRestMethods {
* <p>
* These responses should be left as-is without any additional processing.
*/
- @RestMethod(name=ANY, path="/error",
+ @RestMethod(method=ANY, path="/error",
summary="Error occurred",
description="An error occurred during handling of the request."
)
@@ -126,7 +126,7 @@ public interface BasicRestMethods {
* @param req The HTTP request.
* @return A collection of timing statistics for each annotated method on this resource.
*/
- @RestMethod(name=GET, path="/stats",
+ @RestMethod(method=GET, path="/stats",
summary="Timing statistics",
description="Timing statistics for method invocations on this resource."
)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestServletGroup.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestServletGroup.java
index 799a69f..9337f66 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestServletGroup.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestServletGroup.java
@@ -41,7 +41,7 @@ public abstract class BasicRestServletGroup extends BasicRestServlet {
* @param req The HTTP request.
* @return The bean containing links to the child resources.
*/
- @RestMethod(name=GET, path="/", summary="Navigation page")
+ @RestMethod(method=GET, path="/", summary="Navigation page")
public ChildResourceDescriptions getChildren(RestRequest req) {
return new ChildResourceDescriptions(req);
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestPath.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestPath.java
index 2b59a63..c1ef02e 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestPath.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestPath.java
@@ -317,7 +317,7 @@ public class RequestPath extends TreeMap<String,String> {
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// REST method</jc>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>,path=<js>"/foo/{bar}/*"</js>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>,path=<js>"/foo/{bar}/*"</js>)
* <jk>public</jk> String doGetById(RequestPathMatch path, <jk>int</jk> bar) {
* <jk>return</jk> path.getRemainder();
* }
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ResponseHandler.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ResponseHandler.java
index 470f9af..df88bdf 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ResponseHandler.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ResponseHandler.java
@@ -62,7 +62,7 @@ import org.apache.juneau.rest.reshandlers.*;
* )
* <jk>public class</jk> Example <jk>extends</jk> RestServlet {
*
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/"</js>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/"</js>)
* <jk>public</jk> Foo test1() {
* <jk>return new</jk> Foo(<js>"123"</js>);
* }
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index 322d6d5..3d11f33 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -829,19 +829,19 @@ public class RestContext extends BeanContext {
* <p class='bcode w800'>
* <jc>// Call this method if Client-Version is at least 2.0.
* // Note that this also matches 2.0.1.</jc>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"2.0"</js>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"2.0"</js>)
* <jk>public</jk> Object method1() {
* ...
* }
*
* <jc>// Call this method if Client-Version is at least 1.1, but less than 2.0.</jc>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"[1.1,2.0)"</js>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"[1.1,2.0)"</js>)
* <jk>public</jk> Object method2() {
* ...
* }
*
* <jc>// Call this method if Client-Version is less than 1.1.</jc>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"[0,1.1)"</js>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"[0,1.1)"</js>)
* <jk>public</jk> Object method3() {
* ...
* }
@@ -1470,7 +1470,7 @@ public class RestContext extends BeanContext {
* <ja>@Rest</ja>(messages=<js>"nls/MyMessages"</js>)
* <jk>public class</jk> MyResource {...}
*
- * <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/hello/{you}"</js>)
+ * <ja>@RestMethod</ja>(method=<js>"GET"</js>, path=<js>"/hello/{you}"</js>)
* <jk>public</jk> Object helloYou(RestRequest <jv>req</jv>, Messages <jv>messages</jv>, <ja>@Path</ja>(<js>"name"</js>) String <jv>you</jv>) {
* String <jv>s</jv>;
*
@@ -3798,7 +3798,7 @@ public class RestContext extends BeanContext {
}
}
if (a != null) {
- methodsFound.add(mi.getSimpleName() + "," + emptyIfNull(firstNonEmpty(a.name(), a.method())) + "," + fixMethodPath(a.path()));
+ methodsFound.add(mi.getSimpleName() + "," + emptyIfNull(a.method()) + "," + fixMethodPath(a.path()));
try {
if (mi.isNotPublic())
throw new RestServletException("@RestMethod method {0}.{1} must be defined as public.", rci.inner().getName(), mi.getSimpleName());
@@ -4078,7 +4078,7 @@ public class RestContext extends BeanContext {
* A typical usage pattern involves using variables inside the {@link HtmlDocConfig @HtmlDocConfig} annotation:
* <p class='bcode w800'>
* <ja>@RestMethod</ja>(
- * name=<jsf>GET</jsf>, path=<js>"/{name}/*"</js>
+ * method=<jsf>GET</jsf>, path=<js>"/{name}/*"</js>
* )
* <ja>@HtmlDocConfig</ja>(
* navlinks={
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestConverter.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestConverter.java
index 96548da..9337bb8 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestConverter.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestConverter.java
@@ -39,7 +39,7 @@ import org.apache.juneau.serializer.*;
* <jk>public class</jk> RequestEchoResource <jk>extends</jk> RestServlet {
*
* <jc>// GET request handler</jc>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/*"</js>, converters={Queryable.<jk>class</jk>,Traversable.<jk>class</jk>})
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/*"</js>, converters={Queryable.<jk>class</jk>,Traversable.<jk>class</jk>})
* <jk>public</jk> HttpServletRequest doGet(RestRequest req) {
* res.setTitle(<js>"Contents of HttpServletRequest object"</js>);
* <jk>return</jk> req;
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestGuard.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestGuard.java
index ec87493..c72b802 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestGuard.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestGuard.java
@@ -48,7 +48,7 @@ import org.apache.juneau.http.exception.*;
* <jk>public</jk> MyResource <jk>extends</jk> RestServlet {
*
* <jc>// Delete method with guard that only allows Billy to call it.</jc>
- * <ja>@RestMethod</ja>(name=<jsf>DELETE</jsf>, guards=BillyGuard.<jk>class</jk>)
+ * <ja>@RestMethod</ja>(method=<jsf>DELETE</jsf>, guards=BillyGuard.<jk>class</jk>)
* <jk>public</jk> doDelete(RestRequest req, RestResponse res) <jk>throws</jk> Exception {...}
* }
* </p>
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMatcher.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMatcher.java
index bd8c3d4..a47b9d6 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMatcher.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMatcher.java
@@ -36,12 +36,12 @@ import org.apache.juneau.rest.annotation.*;
* <p class='bcode w800'>
* <jk>public class</jk> MyResource <jk>extends</jk> RestServlet {
*
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foo"</js>, matchers=IsDNT.<jk>class</jk>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/foo"</js>, matchers=IsDNT.<jk>class</jk>)
* <jk>public</jk> Object doGetWithDNT() {
* <jc>// Handle request with Do-Not-Track specified</jc>
* }
*
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foo"</js>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/foo"</js>)
* <jk>public</jk> Object doGetWithoutDNT() {
* <jc>// Handle request without Do-Not-Track specified</jc>
* }
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodContext.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodContext.java
index 3e37b49..b028b57 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodContext.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodContext.java
@@ -103,15 +103,15 @@ public class RestMethodContext extends BeanContext implements Comparable<RestMet
* <p class='bcode w800'>
* <jc>// Call this method if X-Client-Version is at least 2.0.
* // Note that this also matches 2.0.1.</jc>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"2.0"</js>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"2.0"</js>)
* <jk>public</jk> Object method1() {...}
*
* <jc>// Call this method if X-Client-Version is at least 1.1, but less than 2.0.</jc>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"[1.1,2.0)"</js>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"[1.1,2.0)"</js>)
* <jk>public</jk> Object method2() {...}
*
* <jc>// Call this method if X-Client-Version is less than 1.1.</jc>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"[0,1.1)"</js>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"[0,1.1)"</js>)
* <jk>public</jk> Object method3() {...}
* </p>
*
@@ -120,11 +120,11 @@ public class RestMethodContext extends BeanContext implements Comparable<RestMet
* backwards compatibility.
* <p class='bcode w800'>
* <jc>// Call this method if X-Client-Version is at least 2.0.</jc>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"2.0"</js>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"2.0"</js>)
* <jk>public</jk> NewPojo newMethod() {...}
*
* <jc>// Call this method if X-Client-Version is at least 1.1, but less than 2.0.</jc>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"[1.1,2.0)"</js>, transforms={NewToOldPojoSwap.<jk>class</jk>})
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"[1.1,2.0)"</js>, transforms={NewToOldPojoSwap.<jk>class</jk>})
* <jk>public</jk> NewPojo oldMethod() {
* <jk>return</jk> newMethod();
* }
@@ -204,7 +204,7 @@ public class RestMethodContext extends BeanContext implements Comparable<RestMet
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>, path=<js>"/*"</js>, defaultFormData={<js>"foo=bar"</js>})
+ * <ja>@RestMethod</ja>(method=<jsf>POST</jsf>, path=<js>"/*"</js>, defaultFormData={<js>"foo=bar"</js>})
* <jk>public</jk> String doGet(<ja>@FormData</ja>(<js>"foo"</js>) String foo) {...}
* </p>
*/
@@ -239,7 +239,7 @@ public class RestMethodContext extends BeanContext implements Comparable<RestMet
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/*"</js>, defaultQuery={<js>"foo=bar"</js>})
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/*"</js>, defaultQuery={<js>"foo=bar"</js>})
* <jk>public</jk> String doGet(<ja>@Query</ja>(<js>"foo"</js>) String foo) {...}
* </p>
*/
@@ -259,7 +259,6 @@ public class RestMethodContext extends BeanContext implements Comparable<RestMet
* <li><b>Session property:</b> <jk>false</jk>
* <li><b>Annotations:</b>
* <ul>
- * <li class='ja'>{@link org.apache.juneau.rest.annotation.RestMethod#name()}
* <li class='ja'>{@link org.apache.juneau.rest.annotation.RestMethod#method()}
* </ul>
* </ul>
@@ -469,7 +468,7 @@ public class RestMethodContext extends BeanContext implements Comparable<RestMet
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Assume "text/json" Accept value when Accept not specified</jc>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/*"</js>, reqAttrs={<js>"Foo: bar"</js>})
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/*"</js>, reqAttrs={<js>"Foo: bar"</js>})
* <jk>public</jk> String doGet() {...}
* </p>
*
@@ -514,7 +513,7 @@ public class RestMethodContext extends BeanContext implements Comparable<RestMet
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Assume "text/json" Accept value when Accept not specified</jc>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/*"</js>, reqHeaders={<js>"Accept: text/json"</js>})
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/*"</js>, reqHeaders={<js>"Accept: text/json"</js>})
* <jk>public</jk> String doGet() {...}
* </p>
*
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
index 58dd30b..926ce86 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
@@ -46,7 +46,7 @@ import org.apache.juneau.serializer.*;
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>)
* <jk>public void</jk> doGet(RestRequest req, RestResponse res) {
* res.setOutput(<js>"Simple string response"</js>);
* }
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Attr.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Attr.java
index 0e59b94..00a03ca 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Attr.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Attr.java
@@ -31,14 +31,14 @@ import org.apache.juneau.oapi.*;
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>)
* <jk>public void</jk> doGet(<ja>@Attr</ja>(<js>"ETag"</js>) UUID etag) {...}
* </p>
*
* <p>
* This is functionally equivalent to the following code...
* <p class='bcode w800'>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>)
* <jk>public void</jk> doPostPerson(RestRequest req, RestResponse res) {
* UUID etag = req.getAttributes().get(UUID.<jk>class</jk>, <js>"ETag"</js>);
* ...
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Method.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Method.java
index 2def5f7..923866a 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Method.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Method.java
@@ -26,7 +26,7 @@ import java.lang.annotation.*;
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestMethod</ja>(name=<js>"*"</js>)
+ * <ja>@RestMethod</ja>(method=<js>"*"</js>)
* <jk>public void</jk> doAnything(RestRequest req, RestResponse res, <ja>@Method</ja> String method) {
* ...
* }
@@ -35,7 +35,7 @@ import java.lang.annotation.*;
* <p>
* This is functionally equivalent to the following code...
* <p class='bcode w800'>
- * <ja>@RestMethod</ja>(name=<js>"*"</js>)
+ * <ja>@RestMethod</ja>(method=<js>"*"</js>)
* <jk>public void</jk> doAnything(RestRequest req, RestResponse res) {
* String method = req.getMethod();
* ...
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/MethodSwagger.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/MethodSwagger.java
index a789047..7c925f3 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/MethodSwagger.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/MethodSwagger.java
@@ -139,7 +139,7 @@ public @interface MethodSwagger {
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <ja>@RestMethod</ja>(
- * name=<jsf>POST</jsf>, path=<js>"/{a}"</js>,
+ * method=<jsf>POST</jsf>, path=<js>"/{a}"</js>,
* description=<js>"This is my method."</js>,
* swagger=<ja>@MethodSwagger</ja>(
* parameters={
@@ -192,7 +192,7 @@ public @interface MethodSwagger {
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <ja>@RestMethod</ja>(
- * name=<jsf>GET</jsf>, path=<js>"/"</js>,
+ * method=<jsf>GET</jsf>, path=<js>"/"</js>,
* swagger=<ja>@MethodSwagger</ja>(
* responses={
<js>"200:{ description:'Okay' },"</js>,
@@ -318,7 +318,7 @@ public @interface MethodSwagger {
* <p class='bcode w800'>
* <jc>// Normal</jc>
* <ja>@RestMethod</ja>(
- * name=<js>"POST"</js>,
+ * method=<js>"POST"</js>,
* path=<js>"/pet"</js>,
* swagger=<ja>@MethodSwagger</ja>(
* summary=<js>"Add pet"</js>,
@@ -334,7 +334,7 @@ public @interface MethodSwagger {
* <p class='bcode w800'>
* <jc>// Free-form</jc>
* <ja>@RestMethod</ja>(
- * name=<js>"POST"</js>,
+ * method=<js>"POST"</js>,
* path=<js>"/pet"</js>,
* swagger=<ja>@MethodSwagger</ja>({
* <js>"summary: 'Add pet',"</js>,
@@ -350,7 +350,7 @@ public @interface MethodSwagger {
* <p class='bcode w800'>
* <jc>// Free-form with variables</jc>
* <ja>@RestMethod</ja>(
- * name=<js>"POST"</js>,
+ * method=<js>"POST"</js>,
* path=<js>"/pet"</js>,
* swagger=<ja>@MethodSwagger</ja>(<js>"$L{addPetSwagger}"</js>)
* )
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java
index 3e39262..a29e3c9 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java
@@ -56,15 +56,15 @@ public @interface RestMethod {
* <p class='bcode w800'>
* <jc>// Call this method if X-Client-Version is at least 2.0.
* // Note that this also matches 2.0.1.</jc>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"2.0"</js>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"2.0"</js>)
* <jk>public</jk> Object method1() {...}
*
* <jc>// Call this method if X-Client-Version is at least 1.1, but less than 2.0.</jc>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"[1.1,2.0)"</js>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"[1.1,2.0)"</js>)
* <jk>public</jk> Object method2() {...}
*
* <jc>// Call this method if X-Client-Version is less than 1.1.</jc>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"[0,1.1)"</js>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"[0,1.1)"</js>)
* <jk>public</jk> Object method3() {...}
* </p>
*
@@ -73,11 +73,11 @@ public @interface RestMethod {
* backwards compatibility.
* <p class='bcode w800'>
* <jc>// Call this method if X-Client-Version is at least 2.0.</jc>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"2.0"</js>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"2.0"</js>)
* <jk>public</jk> NewPojo newMethod() {...}
*
* <jc>// Call this method if X-Client-Version is at least 1.1, but less than 2.0.</jc>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"[1.1,2.0)"</js>, transforms={NewToOldPojoSwap.<jk>class</jk>})
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"[1.1,2.0)"</js>, transforms={NewToOldPojoSwap.<jk>class</jk>})
* <jk>public</jk> NewPojo oldMethod() {
* <jk>return</jk> newMethod();
* }
@@ -214,7 +214,7 @@ public @interface RestMethod {
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestMethod</ja>(name=<jsf>POST</jsf>, path=<js>"/*"</js>, defaultFormData={<js>"foo=bar"</js>})
+ * <ja>@RestMethod</ja>(method=<jsf>POST</jsf>, path=<js>"/*"</js>, defaultFormData={<js>"foo=bar"</js>})
* <jk>public</jk> String doGet(<ja>@FormData</ja>(<js>"foo"</js>) String foo) {...}
* </p>
*
@@ -241,7 +241,7 @@ public @interface RestMethod {
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/*"</js>, defaultQuery={<js>"foo=bar"</js>})
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/*"</js>, defaultQuery={<js>"foo=bar"</js>})
* <jk>public</jk> String doGet(<ja>@Query</ja>(<js>"foo"</js>) String foo) {...}
* </p>
*
@@ -380,13 +380,6 @@ public @interface RestMethod {
/**
* REST method name.
*
- * Synonym for {@link #name()}.
- */
- String method() default "";
-
- /**
- * REST method name.
- *
* <p>
* Typically <js>"GET"</js>, <js>"PUT"</js>, <js>"POST"</js>, <js>"DELETE"</js>, or <js>"OPTIONS"</js>.
*
@@ -428,7 +421,7 @@ public @interface RestMethod {
* parameter.
* </ul>
*/
- String name() default "";
+ String method() default "";
/**
* Dynamically apply this annotation to the specified methods.
@@ -456,7 +449,7 @@ public @interface RestMethod {
* <jk>public class</jk> MyResource <jk>extends</jk> RestServlet {
*
* <ja>@RestMethod</ja>(
- * name=<jsf>PUT</jsf>,
+ * method=<jsf>PUT</jsf>,
* path=<js>"/foo"</js>,
* parsers=MySpecialParser.<jk>class</jk>
* )
@@ -485,10 +478,10 @@ public @interface RestMethod {
*
* <h5 class='figure'>Examples:</h5>
* <p class='bcode w800'>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/myurl/{foo}/{bar}/{baz}/*"</js>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/myurl/{foo}/{bar}/{baz}/*"</js>)
* </p>
* <p class='bcode w800'>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/myurl/{0}/{1}/{2}/*"</js>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/myurl/{0}/{1}/{2}/*"</js>)
* </p>
*
* <p>
@@ -497,12 +490,12 @@ public @interface RestMethod {
* <h5 class='figure'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Path is assumed to be "/foo".</jc>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>)
* <jk>public void</jk> foo() {...}
* </p>
*
* <p>
- * If you also do not specify the {@link #name()} and the Java method name starts with <js>"get"</js>, <js>"put"</js>, <js>"post"</js>, or <js>"deleted"</js>,
+ * If you also do not specify the {@link #method()} and the Java method name starts with <js>"get"</js>, <js>"put"</js>, <js>"post"</js>, or <js>"deleted"</js>,
* then the HTTP method name is stripped from the inferred path.
*
* <h5 class='figure'>Examples:</h5>
@@ -545,7 +538,7 @@ public @interface RestMethod {
* <h5 class='figure'>Example:</h5>
* <p class='bcode w800'>
* <ja>@RestMethod</ja>(
- * name=<jsf>GET</jsf>,
+ * method=<jsf>GET</jsf>,
* paths={<js>"/"</js>,<js>"/{foo}"</js>}
* )
* <jk>public</jk> String doGet(<ja>@Path</ja>(name=<js>"foo"</js>,required=<jk>false</jk>) String foo) {...}
@@ -604,7 +597,7 @@ public @interface RestMethod {
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Assume "text/json" Accept value when Accept not specified</jc>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/*"</js>, reqAttrs={<js>"Foo: bar"</js>})
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/*"</js>, reqAttrs={<js>"Foo: bar"</js>})
* <jk>public</jk> String doGet() {...}
* </p>
*
@@ -629,7 +622,7 @@ public @interface RestMethod {
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Assume "text/json" Accept value when Accept not specified</jc>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/*"</js>, reqHeaders={<js>"Accept: text/json"</js>})
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, path=<js>"/*"</js>, reqHeaders={<js>"Accept: text/json"</js>})
* <jk>public</jk> String doGet() {...}
* </p>
*
@@ -656,7 +649,7 @@ public @interface RestMethod {
* <jk>public class</jk> MyResource <jk>extends</jk> RestServlet {
*
* <ja>@RestMethod</ja>(
- * name=<jsf>GET</jsf>,
+ * method=<jsf>GET</jsf>,
* path=<js>"/foo"</js>,
* roleGuard=<js>"ROLE_ADMIN || (ROLE_READ_WRITE && ROLE_SPECIAL)"</js>
* )
@@ -713,7 +706,7 @@ public @interface RestMethod {
* <jk>public class</jk> MyResource <jk>extends</jk> RestServlet {
*
* <ja>@RestMethod</ja>(
- * name=<jsf>GET</jsf>,
+ * method=<jsf>GET</jsf>,
* path=<js>"/foo"</js>,
* rolesDeclared=<js>"ROLE_ADMIN,ROLE_READ_WRITE,ROLE_READ_ONLY,ROLE_SPECIAL"</js>,
* roleGuard=<js>"ROLE_ADMIN || (ROLE_READ_WRITE && ROLE_SPECIAL)"</js>
@@ -747,7 +740,7 @@ public @interface RestMethod {
* <jk>public class</jk> MyResource <jk>extends</jk> RestServlet {
*
* <ja>@RestMethod</ja>(
- * name=<jsf>GET</jsf>,
+ * method=<jsf>GET</jsf>,
* path=<js>"/foo"</js>,
* serializers=MySpecialSerializer.<jk>class</jk>
* )
@@ -800,7 +793,7 @@ public @interface RestMethod {
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <ja>@RestMethod</ja>(
- * name=<jsf>PUT</jsf>,
+ * method=<jsf>PUT</jsf>,
* path=<js>"/{propertyName}"</js>,
*
* <jc>// Swagger info.</jc>
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethodAnnotation.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethodAnnotation.java
index 13f59c5..d27c4b4 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethodAnnotation.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethodAnnotation.java
@@ -69,7 +69,7 @@ public class RestMethodAnnotation {
Logging logging = LoggingAnnotation.DEFAULT;
MethodSwagger swagger = MethodSwaggerAnnotation.DEFAULT;
Property[] properties = new Property[0];
- String clientVersion="", debug="", defaultAccept="", defaultCharset="", defaultContentType="", maxInput="", name="", method="", path="", rolesDeclared="", roleGuard="", summary="";
+ String clientVersion="", debug="", defaultAccept="", defaultCharset="", defaultContentType="", maxInput="", method="", path="", rolesDeclared="", roleGuard="", summary="";
String[] consumes={}, defaultFormData={}, defaultQuery={}, description={}, flags={}, paths={}, produces={}, reqAttrs={}, reqHeaders={};
/**
@@ -276,17 +276,6 @@ public class RestMethodAnnotation {
}
/**
- * Sets the {@link RestMethod#name()} property on this annotation.
- *
- * @param value The new value for this property.
- * @return This object (for method chaining).
- */
- public Builder name(String value) {
- this.name = value;
- return this;
- }
-
- /**
* Sets the {@link RestMethod#parsers()} property on this annotation.
*
* @param value The new value for this property.
@@ -456,7 +445,7 @@ public class RestMethodAnnotation {
private final Logging logging;
private final MethodSwagger swagger;
private final Property[] properties;
- private final String clientVersion, debug, defaultAccept, defaultCharset, defaultContentType, maxInput, name, method, path, rolesDeclared, roleGuard, summary;
+ private final String clientVersion, debug, defaultAccept, defaultCharset, defaultContentType, maxInput, method, path, rolesDeclared, roleGuard, summary;
private final String[] consumes, defaultFormData, defaultQuery, description, flags, paths, produces, reqAttrs, reqHeaders;
Impl(Builder b) {
@@ -478,7 +467,6 @@ public class RestMethodAnnotation {
this.matchers = copyOf(b.matchers);
this.maxInput = b.maxInput;
this.method = b.method;
- this.name = b.name;
this.parsers = copyOf(b.parsers);
this.path = b.path;
this.paths = copyOf(b.paths);
@@ -581,11 +569,6 @@ public class RestMethodAnnotation {
}
@Override /* RestMethod */
- public String name() {
- return name;
- }
-
- @Override /* RestMethod */
public Class<?>[] parsers() {
return parsers;
}
@@ -788,9 +771,6 @@ public class RestMethodAnnotation {
if (! a.method().isEmpty())
psb.set(RESTMETHOD_httpMethod, string(a.method()));
- if (! a.name().isEmpty())
- psb.set(RESTMETHOD_httpMethod, string(a.name()));
-
if (a.priority() != 0)
psb.set(RESTMETHOD_priority, a.priority());
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/Traversable.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/Traversable.java
index a05856f..e493a81 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/Traversable.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/Traversable.java
@@ -29,7 +29,7 @@ import org.apache.juneau.utils.*;
*
* <p class='bcode w800'>
* <jc>// Resource method on resource "http://localhost:8080/sample/addressBook"</jc>
- * <ja>@RestMethod</ja>(name=<jsf>GET</jsf>, converters=Traversable.<jk>class</jk>)
+ * <ja>@RestMethod</ja>(method=<jsf>GET</jsf>, converters=Traversable.<jk>class</jk>)
* <jk>public void</jk> doGet(RestRequest req, RestResponse res) {
* <jk>return new</jk> AddressBook();
* }
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remote/RrpcServlet.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remote/RrpcServlet.java
index f1e0dcd..289f675 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remote/RrpcServlet.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remote/RrpcServlet.java
@@ -74,7 +74,7 @@ public abstract class RrpcServlet extends BasicRestServlet {
//-----------------------------------------------------------------------------------------------------------------
@RestMethod(
- name=GET,
+ method=GET,
path="/",
summary="List of available remote interfaces",
description="Shows a list of the interfaces registered with this remote interface servlet."
@@ -87,7 +87,7 @@ public abstract class RrpcServlet extends BasicRestServlet {
}
@RestMethod(
- name=GET,
+ method=GET,
path="/{javaInterface}",
summary="List of available methods on interface",
description="Shows a list of all the exposed methods on an interface."
@@ -106,7 +106,7 @@ public abstract class RrpcServlet extends BasicRestServlet {
}
@RestMethod(
- name=GET,
+ method=GET,
path="/{javaInterface}/{javaMethod}",
summary="Form entry for interface method call",
description="Shows a form entry page for executing a remote interface method."
@@ -154,7 +154,7 @@ public abstract class RrpcServlet extends BasicRestServlet {
}
@RestMethod(
- name=POST,
+ method=POST,
path="/{javaInterface}/{javaMethod}",
summary="Invoke an interface method",
description="Invoke a Java method by passing in the arguments as an array of serialized objects.\nThe returned object is then serialized to the response.",
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/ContentTypeMenuItem.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/ContentTypeMenuItem.java
index 5d16b8b..cf8dc6c 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/ContentTypeMenuItem.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/ContentTypeMenuItem.java
@@ -34,7 +34,7 @@ import org.apache.juneau.serializer.*;
* a drop-down menu item for rendering all other supported content types in plain text:
* <p class='bcode w800'>
* <ja>@RestMethod</ja>(
- * name=<jsf>GET</jsf>,
+ * method=<jsf>GET</jsf>,
* path=<js>"/"</js>
* )
* <ja>@HtmlDocConfig</ja>(
diff --git a/juneau-sc/juneau-sc-server/src/main/java/org/apache/juneau/server/config/rest/LoadConfigResource.java b/juneau-sc/juneau-sc-server/src/main/java/org/apache/juneau/server/config/rest/LoadConfigResource.java
index 518f5ed..b520136 100644
--- a/juneau-sc/juneau-sc-server/src/main/java/org/apache/juneau/server/config/rest/LoadConfigResource.java
+++ b/juneau-sc/juneau-sc-server/src/main/java/org/apache/juneau/server/config/rest/LoadConfigResource.java
@@ -26,7 +26,7 @@ public class LoadConfigResource extends RestServlet {
private static final long serialVersionUID = 8247663789227304097L;
- @RestMethod(name = GET, path = "/{project}/{branch}/*", consumes = "application/json", produces = "application/json")
+ @RestMethod(method = GET, path = "/{project}/{branch}/*", consumes = "application/json", produces = "application/json")
public String gets(@Path("project") String project, @Path("branch") String branch) throws Exception {
JsonSerializer jsonSerializer = JsonSerializer.DEFAULT_READABLE;