svn commit: r1200939 - in /cxf/branches/2.4.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java

[sergeyb]

Author: sergeyb
Date: Fri Nov 11 16:36:55 2011
New Revision: 1200939

URL: http://svn.apache.org/viewvc?rev=1200939&view=rev
Log:
Merged revisions 1200934 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1200934 | sergeyb | 2011-11-11 16:30:42 +0000 (Fri, 11 Nov 2011) | 1 line
  
  [CXF-3770] Checking enums better
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
    
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 11 16:36:55 2011
@@ -1 +1 @@
-/cxf/trunk:1197048,1198584,1198875,1198884,1199905,1200850,1200876,1200920
+/cxf/trunk:1197048,1198584,1198875,1198884,1199905,1200850,1200876,1200920,1200934

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java?rev=1200939&r1=1200938&r2=1200939&view=diff
==============================================================================
--- 
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
 (original)
+++ 
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
 Fri Nov 11 16:36:55 2011
@@ -546,7 +546,7 @@ public class WadlGenerator implements Re
                 name = parentName + "." + name;
             }
             Class<?> paramCls = entry.getValue();
-            boolean isPrimitive = InjectionUtils.isPrimitive(paramCls);
+            boolean isPrimitive = InjectionUtils.isPrimitive(paramCls) || 
paramCls.isEnum();
             if (isPrimitive || 
InjectionUtils.isSupportedCollectionOrArray(paramCls)) {
                 doWriteParam(sb, entry.getKey(), paramCls, paramCls, name, new 
Annotation[]{});
             } else {

Modified: 
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java?rev=1200939&r1=1200938&r2=1200939&view=diff
==============================================================================
--- 
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
 (original)
+++ 
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
 Fri Nov 11 16:36:55 2011
@@ -370,11 +370,12 @@ public class WadlGeneratorTest extends A
         List<Element> requestEls = getElements(methodEls.get(0), "request", 1);
         
         // 4 parameters are expected
-        verifyParameters(requestEls.get(0), 4, 
+        verifyParameters(requestEls.get(0), 5, 
                          new Param("a", "query", "xs:int"),
                          new Param("c.a", "query", "xs:int"),
                          new Param("c.b", "query", "xs:int"),
-                         new Param("c.d.a", "query", "xs:int"));
+                         new Param("c.d.a", "query", "xs:int"),
+                         new Param("e", "query", "xs:string", 
Collections.singleton("A")));
         
         assertEquals(0, DOMUtils.getChildrenWithName(requestEls.get(0), 
                          WadlGenerator.WADL_NS, "representation").size());