Return-Path: 
 <commits-return-10585-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: (qmail 24847 invoked from network); 11 Dec 2009 18:18:27 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 11 Dec 2009 18:18:27 -0000
Received: (qmail 87979 invoked by uid 500); 11 Dec 2009 18:18:27 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 87893 invoked by uid 500); 11 Dec 2009 18:18:26 -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 87884 invoked by uid 99); 11 Dec 2009 18:18:26 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Dec 2009 18:18:26 +0000
X-ASF-Spam-Status: No, hits=-2.6 required=5.0
	tests=AWL,BAYES_00
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Dec 2009 18:18:24 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 57D9D23889D2; Fri, 11 Dec 2009 18:18:04 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r889740 - in /cxf/trunk/rt/frontend/jaxrs/src:
 main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
 test/java/org/apache/cxf/jaxrs/model/wadl/BookStore.java
 test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
Date: Fri, 11 Dec 2009 18:18:04 -0000
To: commits@cxf.apache.org
From: sergeyb@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20091211181804.57D9D23889D2@eris.apache.org>

Author: sergeyb
Date: Fri Dec 11 18:18:03 2009
New Revision: 889740

URL: http://svn.apache.org/viewvc?rev=889740&view=rev
Log:
JAXRS : better nested beans support in WADLGenerator

Modified:
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
    cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/BookStore.java
    cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java?rev=889740&r1=889739&r2=889740&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java Fri Dec 11 18:18:03 2009
@@ -309,18 +309,30 @@
     private void writeParam(StringBuilder sb, Parameter pm, OperationResourceInfo ori) {
         Class<?> type = ori.getMethodToInvoke().getParameterTypes()[pm.getIndex()];
         if (!"".equals(pm.getName())) {
-            doWriteParam(sb, pm, type);
+            doWriteParam(sb, pm, type, pm.getName());
         } else {
-            Map<Parameter, Class<?>> pms = InjectionUtils.getParametersFromBeanClass(type, pm.getType());
-            for (Map.Entry<Parameter, Class<?>> entry : pms.entrySet()) {   
-                doWriteParam(sb, entry.getKey(), entry.getValue());
+            doWriteBeanParam(sb, type, pm, null);
+        }
+    }
+    
+    private void doWriteBeanParam(StringBuilder sb, Class<?> type, Parameter pm, String parentName) {
+        Map<Parameter, Class<?>> pms = InjectionUtils.getParametersFromBeanClass(type, pm.getType());
+        for (Map.Entry<Parameter, Class<?>> entry : pms.entrySet()) {
+            String name = entry.getKey().getName();
+            if (parentName != null) {
+                name = parentName + "." + name;
+            }
+            if (InjectionUtils.isPrimitive(entry.getValue())) {
+                doWriteParam(sb, entry.getKey(), entry.getValue(), name);
+            } else {
+                doWriteBeanParam(sb, entry.getValue(), entry.getKey(), name);
             }
         }
     }
     
-    private void doWriteParam(StringBuilder sb, Parameter pm, Class<?> type) {
+    private void doWriteParam(StringBuilder sb, Parameter pm, Class<?> type, String paramName) {
         
-        sb.append("<param name=\"").append(pm.getName()).append("\" ");
+        sb.append("<param name=\"").append(paramName).append("\" ");
         String style = ParameterType.PATH == pm.getType() ? "template" 
                        : ParameterType.FORM == pm.getType() ? "query"
                        : pm.getType().toString().toLowerCase();

Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/BookStore.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/BookStore.java?rev=889740&r1=889739&r2=889740&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/BookStore.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/BookStore.java Fri Dec 11 18:18:03 2009
@@ -50,16 +50,18 @@
     
     @POST
     @Path("books/{bookid}")
+    //CHECKSTYLE:OFF
     public Book addBook(@PathParam("id") int id,
                         @PathParam("bookid") int bookId,
                         @MatrixParam("mid") int matrixId,
                         @HeaderParam("hid") int headerId,
                         @CookieParam("cid") int cookieId,
+                        @QueryParam("provider.bar") int queryParam,
                         @Context HttpHeaders headers,
                         Book b) {
         return new Book(1);
     }
-    
+    //CHECKSTYLE:ON
     @Path("booksubresource")
     public Book getBook() {
         return new Book(1);
@@ -85,6 +87,50 @@
     public static class QueryBean {
         private int a;
         private int b;
+        private QueryBean2 bean;
+        
+        public int getA() {
+            return a;
+        }
+        
+        public int getB() {
+            return b;
+        }
+        
+        public QueryBean2 getC() {
+            return bean;
+        }
+        
+        public void setC(QueryBean2 c) {
+            bean = c;
+        }
+    }
+    
+    public static class QueryBean2 {
+        private int a;
+        private int b;
+        private QueryBean3 bean;
+        
+        public int getA() {
+            return a;
+        }
+        
+        public int getB() {
+            return b;
+        }
+        
+        public QueryBean3 getD() {
+            return bean;
+        }
+        
+        public void setD(QueryBean3 d) {
+            bean = d;
+        }
+    }
+    
+    public static class QueryBean3 {
+        private int a;
+        private int b;
         
         public int getA() {
             return a;

Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java?rev=889740&r1=889739&r2=889740&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java Fri Dec 11 18:18:03 2009
@@ -18,6 +18,8 @@
  */
 package org.apache.cxf.jaxrs.model.wadl;
 
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.List;
@@ -82,14 +84,14 @@
         assertNotNull(r);
         assertEquals(WadlGenerator.WADL_TYPE.toString(),
                      r.getMetadata().getFirst(HttpHeaders.CONTENT_TYPE));
-//        File f = new File("test.xml");
-//        f.delete();
-//        f.createNewFile();
-//        System.out.println(f.getAbsolutePath());
-//        FileOutputStream fos = new FileOutputStream(f);
-//        fos.write(r.getEntity().toString().getBytes());
-//        fos.flush();
-//        fos.close();
+        File f = new File("test.xml");
+        f.delete();
+        f.createNewFile();
+        System.out.println(f.getAbsolutePath());
+        FileOutputStream fos = new FileOutputStream(f);
+        fos.write(r.getEntity().toString().getBytes());
+        fos.flush();
+        fos.close();
     }
     
     @Test
@@ -165,9 +167,13 @@
         
         paramsEls = DOMUtils.getChildrenWithName(requestEls.get(0), 
                                                  WadlGenerator.WADL_NS, "param");
-        assertEquals(2, paramsEls.size());
+        assertEquals(6, paramsEls.size());
         checkParameter(paramsEls.get(0), "a", "query");
         checkParameter(paramsEls.get(1), "b", "query");
+        checkParameter(paramsEls.get(2), "c.a", "query");
+        checkParameter(paramsEls.get(3), "c.b", "query");
+        checkParameter(paramsEls.get(4), "c.d.a", "query");
+        checkParameter(paramsEls.get(5), "c.d.b", "query");
         
         paramsEls = DOMUtils.getChildrenWithName(resourceEls.get(2), 
                                                                WadlGenerator.WADL_NS, "param");