This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
The following commit(s) were added to refs/heads/master by this push:
new d2be1a3 JAMES-2099 Fix failing dataType resolution with Swagger
d2be1a3 is described below
commit d2be1a35b61c7ac201481aa5120c4b0588b75cbd
Author: Benoit Tellier <btell...@linagora.com>
AuthorDate: Fri Sep 27 11:46:06 2019 +0700
JAMES-2099 Fix failing dataType resolution with Swagger
Swagger routes fails at resolving some of our datatypes, resulting in
verbose error logs.
For complicated FQCN, relying on dataTypeClass is a better choice.
---
.../org/apache/james/webadmin/routes/CassandraMailboxMergingRoutes.java | 2 +-
.../java/org/apache/james/webadmin/routes/DLPConfigurationRoutes.java | 2 +-
.../src/main/java/org/apache/james/webadmin/routes/UserRoutes.java | 2 +-
.../main/java/org/apache/james/webadmin/routes/DomainQuotaRoutes.java | 2 +-
.../main/java/org/apache/james/webadmin/routes/GlobalQuotaRoutes.java | 2 +-
.../src/main/java/org/apache/james/webadmin/routes/UserQuotaRoutes.java | 2 +-
.../src/main/java/org/apache/james/webadmin/routes/MailQueueRoutes.java | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/server/protocols/webadmin/webadmin-cassandra/src/main/java/org/apache/james/webadmin/routes/CassandraMailboxMergingRoutes.java
b/server/protocols/webadmin/webadmin-cassandra/src/main/java/org/apache/james/webadmin/routes/CassandraMailboxMergingRoutes.java
index b882013..e0019a6 100644
---
a/server/protocols/webadmin/webadmin-cassandra/src/main/java/org/apache/james/webadmin/routes/CassandraMailboxMergingRoutes.java
+++
b/server/protocols/webadmin/webadmin-cassandra/src/main/java/org/apache/james/webadmin/routes/CassandraMailboxMergingRoutes.java
@@ -96,7 +96,7 @@ public class CassandraMailboxMergingRoutes implements Routes {
@ApiImplicitParam(
required = true,
paramType = "body",
- dataType = "Mailbox merging request",
+ dataTypeClass = MailboxMergingRequest.class,
example =
"{\"oldMailboxId\":\"4555-656-4554\",\"oldMailboxId\":\"9693-665-2500\"}",
value = "The mailboxes to merge together.")
})
diff --git
a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/DLPConfigurationRoutes.java
b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/DLPConfigurationRoutes.java
index 2a8769c..cde7141 100644
---
a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/DLPConfigurationRoutes.java
+++
b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/DLPConfigurationRoutes.java
@@ -110,7 +110,7 @@ public class DLPConfigurationRoutes implements Routes {
@ApiOperation(value = "Store a DLP configuration for given senderDomain")
@ApiImplicitParams({
@ApiImplicitParam(required = true, dataType = "string", name =
"senderDomain", paramType = "path"),
- @ApiImplicitParam(required = true, dataType =
"org.apache.james.webadmin.dto.DLPConfigurationDTO", paramType = "body")
+ @ApiImplicitParam(required = true, dataTypeClass =
DLPConfigurationDTO.class, paramType = "body")
})
@ApiResponses(value = {
@ApiResponse(code = HttpStatus.NO_CONTENT_204, message = "OK. DLP
configuration is stored."),
diff --git
a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/UserRoutes.java
b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/UserRoutes.java
index 0e7735d..75f4a92 100644
---
a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/UserRoutes.java
+++
b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/UserRoutes.java
@@ -113,7 +113,7 @@ public class UserRoutes implements Routes {
@ApiOperation(value = "Creating an user")
@ApiImplicitParams({
@ApiImplicitParam(required = true, dataType = "string", name =
"username", paramType = "path"),
- @ApiImplicitParam(required = true, dataType =
"org.apache.james.webadmin.dto.AddUserRequest", paramType = "body")
+ @ApiImplicitParam(required = true, dataTypeClass =
AddUserRequest.class, paramType = "body")
})
@ApiResponses(value = {
@ApiResponse(code = HttpStatus.NO_CONTENT_204, message = "OK. New
user is added."),
diff --git
a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/DomainQuotaRoutes.java
b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/DomainQuotaRoutes.java
index 7b21366..115bb83 100644
---
a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/DomainQuotaRoutes.java
+++
b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/DomainQuotaRoutes.java
@@ -119,7 +119,7 @@ public class DomainQuotaRoutes implements Routes {
@PUT
@ApiOperation(value = "Updating count and size at the same time")
@ApiImplicitParams({
- @ApiImplicitParam(required = true, dataType =
"org.apache.james.webadmin.dto.QuotaDTO", paramType = "body")
+ @ApiImplicitParam(required = true, dataTypeClass = QuotaDTO.class,
paramType = "body")
})
@ApiResponses(value = {
@ApiResponse(code = HttpStatus.NO_CONTENT_204, message = "OK. The
value has been updated."),
diff --git
a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/GlobalQuotaRoutes.java
b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/GlobalQuotaRoutes.java
index c4df685..a1c4cb6 100644
---
a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/GlobalQuotaRoutes.java
+++
b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/GlobalQuotaRoutes.java
@@ -104,7 +104,7 @@ public class GlobalQuotaRoutes implements Routes {
@PUT
@ApiOperation(value = "Updating count and size at the same time")
@ApiImplicitParams({
- @ApiImplicitParam(required = true, dataType =
"org.apache.james.webadmin.dto.QuotaDTO", paramType = "body")
+ @ApiImplicitParam(required = true, dataTypeClass = QuotaDTO.class,
paramType = "body")
})
@ApiResponses(value = {
@ApiResponse(code = HttpStatus.NO_CONTENT_204, message = "OK. The
value has been updated."),
diff --git
a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/UserQuotaRoutes.java
b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/UserQuotaRoutes.java
index e14a270..70f38ab 100644
---
a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/UserQuotaRoutes.java
+++
b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/UserQuotaRoutes.java
@@ -121,7 +121,7 @@ public class UserQuotaRoutes implements Routes {
@PUT
@ApiOperation(value = "Updating count and size at the same time")
@ApiImplicitParams({
- @ApiImplicitParam(required = true, dataType =
"org.apache.james.webadmin.dto.QuotaDTO", paramType = "body")
+ @ApiImplicitParam(required = true, dataTypeClass = QuotaDTO.class,
paramType = "body")
})
@ApiResponses(value = {
@ApiResponse(code = HttpStatus.NO_CONTENT_204, message = "OK. The
value has been updated."),
diff --git
a/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/routes/MailQueueRoutes.java
b/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/routes/MailQueueRoutes.java
index 1b0b86e..1776162 100644
---
a/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/routes/MailQueueRoutes.java
+++
b/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/routes/MailQueueRoutes.java
@@ -267,7 +267,7 @@ public class MailQueueRoutes implements Routes {
@ApiImplicitParam(required = true, dataType = "string", name =
"mailQueueName", paramType = "path"),
@ApiImplicitParam(
required = false,
- dataType = "MailAddress",
+ dataTypeClass = MailAddress.class,
name = SENDER_QUERY_PARAM,
paramType = "query",
example = "?sender=sen...@james.org",
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
