Return-Path: 
 <commits-return-33410-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 421F4113E4
	for <apmail-cxf-commits-archive@www.apache.org>;
 Mon, 11 Aug 2014 11:45:13 +0000 (UTC)
Received: (qmail 21459 invoked by uid 500); 11 Aug 2014 11:45:13 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 21398 invoked by uid 500); 11 Aug 2014 11:45:13 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 21389 invoked by uid 99); 11 Aug 2014 11:45:13 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Aug 2014 11:45:13 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id C08929AAE70; Mon, 11 Aug 2014 11:45:12 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: sergeyb@apache.org
To: commits@cxf.apache.org
Message-Id: <2733657c849f4dcb855216518e6b8643@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: [CXF-5934] Introdicng gew protected methods to make it
 simpler to override handleOperation
Date: Mon, 11 Aug 2014 11:45:12 +0000 (UTC)

Repository: cxf
Updated Branches:
  refs/heads/master 9344b093b -> 8e4a6b56a


[CXF-5934] Introdicng gew protected methods to make it simpler to override handleOperation


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8e4a6b56
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8e4a6b56
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8e4a6b56

Branch: refs/heads/master
Commit: 8e4a6b56a0e35b2a0b55ade98df12ab24a53fa8f
Parents: 9344b09
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Mon Aug 11 12:44:54 2014 +0100
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Mon Aug 11 12:44:54 2014 +0100

----------------------------------------------------------------------
 .../cxf/jaxrs/model/wadl/WadlGenerator.java     | 37 +++++++++++++++-----
 1 file changed, 29 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/8e4a6b56/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 352a7cf..8800f5b 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
@@ -450,13 +450,34 @@ public class WadlGenerator implements ContainerRequestFilter {
         return change ? builder.toString() : value;
     }
     
-    private void startMethodTag(StringBuilder sb, OperationResourceInfo ori) {
+    protected void startMethodTag(StringBuilder sb, OperationResourceInfo ori) {
         sb.append("<method name=\"").append(ori.getHttpMethod()).append("\"");
         if (addResourceAndMethodIds) {
             sb.append(" id=\"").append(getMethod(ori).getName()).append("\"");
         }
         sb.append(">");
     }
+    protected void endMethodTag(StringBuilder sb, OperationResourceInfo ori) {
+        sb.append("</method>");
+    }
+    protected void startMethodRequestTag(StringBuilder sb, OperationResourceInfo ori) {
+        sb.append("<request>");
+    }
+    protected void startMethodResponseTag(StringBuilder sb, OperationResourceInfo ori) {
+        sb.append("<response");
+    }
+    protected void endMethodRequestTag(StringBuilder sb, OperationResourceInfo ori) {
+        sb.append("</request>");
+    }
+    protected void endMethodResponseTag(StringBuilder sb, OperationResourceInfo ori) {
+        sb.append("</response>");
+    }
+    protected void startResourceTag(StringBuilder sb, OperationResourceInfo ori, String path) {
+        sb.append("<resource path=\"").append(path).append("\">");
+    }
+    protected void endResourceTag(StringBuilder sb, OperationResourceInfo ori) {
+        sb.append("</resource>");
+    }
 
     // CHECKSTYLE:OFF
     protected boolean handleOperation(StringBuilder sb, Set<Class<?>> jaxbTypes,
@@ -478,7 +499,7 @@ public class WadlGenerator implements ContainerRequestFilter {
                     path = path.substring(1);
                 }
             }
-            sb.append("<resource path=\"").append(getPath(path)).append("\">");
+            startResourceTag(sb, ori, getPath(path));
             handleDocs(anns, sb, DocTarget.RESOURCE, false, isJson);
             handlePathAndMatrixClassParams(ori, sb, classParams, isJson);
             handlePathAndMatrixParams(sb, ori, isJson);
@@ -492,7 +513,7 @@ public class WadlGenerator implements ContainerRequestFilter {
             handleOperJavaDocs(ori, sb);
         }
         if (getMethod(ori).getParameterTypes().length != 0 || classParams.size() != 0) {
-            sb.append("<request>");
+            startMethodRequestTag(sb, ori);
             handleDocs(anns, sb, DocTarget.REQUEST, false, isJson);
 
             boolean isForm = isFormRequest(ori);
@@ -507,9 +528,9 @@ public class WadlGenerator implements ContainerRequestFilter {
             if (isForm) {
                 handleFormRepresentation(sb, jaxbTypes, qnameResolver, clsMap, ori, getFormClass(ori), isJson);
             }
-            sb.append("</request>");
+            endMethodRequestTag(sb, ori);
         }
-        sb.append("<response");
+        startMethodResponseTag(sb, ori);
         Class<?> returnType = getMethod(ori).getReturnType();
         boolean isVoid = void.class == returnType;
         if (isVoid) {
@@ -521,12 +542,12 @@ public class WadlGenerator implements ContainerRequestFilter {
         if (!isVoid) {
             handleRepresentation(sb, jaxbTypes, qnameResolver, clsMap, ori, returnType, isJson, false);
         }
-        sb.append("</response>");
+        endMethodResponseTag(sb, ori);
 
-        sb.append("</method>");
+        endMethodTag(sb, ori);
 
         if (resourceTagOpened && !samePathOperationFollows) {
-            sb.append("</resource>");
+            endResourceTag(sb, ori);
             resourceTagOpened = false;
         }
         return resourceTagOpened;