Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 91EC5200B81 for ; Tue, 30 Aug 2016 01:22:49 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8DAA5160AD4; Mon, 29 Aug 2016 23:22:49 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A1FAD160ACD for ; Tue, 30 Aug 2016 01:22:48 +0200 (CEST) Received: (qmail 93481 invoked by uid 500); 29 Aug 2016 23:22:47 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 93055 invoked by uid 99); 29 Aug 2016 23:22:47 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Aug 2016 23:22:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 35EBDE3889; Mon, 29 Aug 2016 23:22:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: reta@apache.org To: commits@cxf.apache.org Date: Mon, 29 Aug 2016 23:22:53 -0000 Message-Id: <27f8a0439867409fae02e5fc0f14b6fa@git.apache.org> In-Reply-To: <4bcdd328ec84459e960aca78c47a9afc@git.apache.org> References: <4bcdd328ec84459e960aca78c47a9afc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/29] cxf git commit: [CXF-7027] WADLGenerator support for AsyncResponse archived-at: Mon, 29 Aug 2016 23:22:49 -0000 [CXF-7027] WADLGenerator support for AsyncResponse Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/14c37eee Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/14c37eee Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/14c37eee Branch: refs/heads/master-jaxrs-2.1 Commit: 14c37eee6523c7e04bcf83dad71330ca126a0f48 Parents: ce9332b Author: Sergey Beryozkin Authored: Fri Aug 26 17:34:49 2016 +0100 Committer: Sergey Beryozkin Committed: Fri Aug 26 17:34:49 2016 +0100 ---------------------------------------------------------------------- .../apache/cxf/jaxrs/model/ParameterType.java | 3 +-- .../apache/cxf/jaxrs/utils/ResourceUtils.java | 21 ++++++++++---------- .../cxf/jaxrs/model/wadl/WadlGenerator.java | 11 ++++++---- .../apache/cxf/jaxrs/model/wadl/BookStore.java | 6 ++++-- 4 files changed, 23 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/14c37eee/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ParameterType.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ParameterType.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ParameterType.java index 2db2afe..243345b 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ParameterType.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ParameterType.java @@ -29,6 +29,5 @@ public enum ParameterType { BEAN, REQUEST_BODY, - CONTEXT, - UNKNOWN + CONTEXT } http://git-wip-us.apache.org/repos/asf/cxf/blob/14c37eee/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java index 32fd44e..28f09ad 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java @@ -625,13 +625,13 @@ public final class ResourceUtils { Method method = ori.getAnnotatedMethod() == null ? ori.getMethodToInvoke() : ori.getAnnotatedMethod(); Class realReturnType = method.getReturnType(); Class cls = realReturnType; - if (cls == Response.class) { + if (cls == Response.class || ori.isAsync()) { cls = getActualJaxbType(cls, method, false); } Type type = method.getGenericReturnType(); if (jaxbOnly) { - checkJaxbType(resource.getServiceClass(), cls, realReturnType == Response.class ? cls : type, types, - method.getAnnotations(), jaxbWriter); + checkJaxbType(resource.getServiceClass(), cls, realReturnType == Response.class || ori.isAsync() + ? cls : type, types, method.getAnnotations(), jaxbWriter); } else { types.getAllTypes().put(cls, type); } @@ -639,14 +639,15 @@ public final class ResourceUtils { for (Parameter pm : ori.getParameters()) { if (pm.getType() == ParameterType.REQUEST_BODY) { Class inType = method.getParameterTypes()[pm.getIndex()]; - Type paramType = method.getGenericParameterTypes()[pm.getIndex()]; - if (jaxbOnly) { - checkJaxbType(resource.getServiceClass(), inType, paramType, types, - method.getParameterAnnotations()[pm.getIndex()], jaxbWriter); - } else { - types.getAllTypes().put(inType, paramType); + if (inType != AsyncResponse.class) { + Type paramType = method.getGenericParameterTypes()[pm.getIndex()]; + if (jaxbOnly) { + checkJaxbType(resource.getServiceClass(), inType, paramType, types, + method.getParameterAnnotations()[pm.getIndex()], jaxbWriter); + } else { + types.getAllTypes().put(inType, paramType); + } } - } } http://git-wip-us.apache.org/repos/asf/cxf/blob/14c37eee/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java ---------------------------------------------------------------------- diff --git a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java index 9f13b4b..d2070ee 100644 --- a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java +++ b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java @@ -57,6 +57,7 @@ import javax.ws.rs.HeaderParam; import javax.ws.rs.MatrixParam; import javax.ws.rs.PathParam; import javax.ws.rs.QueryParam; +import javax.ws.rs.container.AsyncResponse; import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerRequestFilter; import javax.ws.rs.core.HttpHeaders; @@ -584,7 +585,9 @@ public class WadlGenerator implements ContainerRequestFilter { if (!handleDocs(anns, sb, DocTarget.METHOD, true, isJson)) { handleOperJavaDocs(ori, sb); } - if (getMethod(ori).getParameterTypes().length != 0 || !classParams.isEmpty()) { + int numOfParams = getMethod(ori).getParameterTypes().length; + if ((numOfParams > 1 || numOfParams == 1 && !ori.isAsync()) || !classParams.isEmpty()) { + startMethodRequestTag(sb, ori); handleDocs(anns, sb, DocTarget.REQUEST, false, isJson); @@ -606,7 +609,7 @@ public class WadlGenerator implements ContainerRequestFilter { } startMethodResponseTag(sb, ori); Class returnType = getMethod(ori).getReturnType(); - boolean isVoid = void.class == returnType; + boolean isVoid = void.class == returnType && !ori.isAsync(); ResponseStatus responseStatus = getMethod(ori).getAnnotation(ResponseStatus.class); if (responseStatus != null) { setResponseStatus(sb, responseStatus.value()); @@ -754,7 +757,7 @@ public class WadlGenerator implements ContainerRequestFilter { ElementQNameResolver qnameResolver, Map, QName> clsMap, OperationResourceInfo ori, Parameter pm, boolean isJson) { Class cls = getMethod(ori).getParameterTypes()[pm.getIndex()]; - if (pm.getType() == ParameterType.REQUEST_BODY) { + if (pm.getType() == ParameterType.REQUEST_BODY && cls != AsyncResponse.class) { handleRepresentation(sb, jaxbTypes, qnameResolver, clsMap, ori, cls, isJson, true); return; } @@ -1031,7 +1034,7 @@ public class WadlGenerator implements ContainerRequestFilter { } Method opMethod = getMethod(ori); - boolean isPrimitive = InjectionUtils.isPrimitive(type); + boolean isPrimitive = InjectionUtils.isPrimitive(type) && !ori.isAsync(); for (MediaType mt : types) { sb.append(" implements BookDescription { @GET @Path("chapter2") @ElementClass(response = Chapter.class) - public Response getChapter2() { - return Response.ok().entity(new Chapter(1)).build(); + public void getChapterAsync(@Suspended AsyncResponse async) { + async.resume(Response.ok().entity(new Chapter(1)).build()); } @Path("form")