svn commit: r1334191 - 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/WadlGeneratorTest.java

[dkulp]

Author: dkulp
Date: Fri May  4 21:33:59 2012
New Revision: 1334191

URL: http://svn.apache.org/viewvc?rev=1334191&view=rev
Log:
Add some predictability into the 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/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=1334191&r1=1334190&r2=1334191&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 May  4 21:33:59 2012
@@ -37,6 +37,8 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.IdentityHashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -220,7 +222,7 @@ public class WadlGenerator implements Re
             schemaWriter == null ? null : createElementQNameResolver(context);
 
         Map<Class<?>, QName> clsMap = new IdentityHashMap<Class<?>, QName>();
-        Set<ClassResourceInfo> visitedResources = new 
HashSet<ClassResourceInfo>();
+        Set<ClassResourceInfo> visitedResources = new 
LinkedHashSet<ClassResourceInfo>();
         for (ClassResourceInfo cri : cris) {
             startResourceTag(sbResources, cri.getServiceClass(), 
cri.getURITemplate().getValue());
             Annotation[] anns = cri.getServiceClass().getAnnotations();
@@ -323,7 +325,7 @@ public class WadlGenerator implements Re
     }
 
     private Map<Parameter, Object> getClassParameters(ClassResourceInfo cri) {
-        Map<Parameter, Object> classParams = new HashMap<Parameter, Object>();
+        Map<Parameter, Object> classParams = new LinkedHashMap<Parameter, 
Object>();
         List<Method> paramMethods = cri.getParameterMethods();
         for (Method m : paramMethods) {
             classParams.put(ResourceUtils.getParameter(0, m.getAnnotations(),
@@ -514,7 +516,7 @@ public class WadlGenerator implements Re
     
     private void doHandleClassParams(StringBuilder sb, Map<Parameter, Object> 
params,
                                      boolean isJson, ParameterType... pType) {
-        Set<ParameterType> pTypes = new 
HashSet<ParameterType>(Arrays.asList(pType));
+        Set<ParameterType> pTypes = new 
LinkedHashSet<ParameterType>(Arrays.asList(pType));
         for (Map.Entry<Parameter, Object> entry : params.entrySet()) {
             Parameter pm = entry.getKey();
             Object obj = entry.getValue();

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=1334191&r1=1334190&r2=1334191&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 May  4 21:33:59 2012
@@ -265,7 +265,9 @@ public class WadlGeneratorTest extends A
         Response r = wg.handleRequest(m, null);
         assertEquals(WadlGenerator.WADL_TYPE.toString(),
                      r.getMetadata().getFirst(HttpHeaders.CONTENT_TYPE));
-        Document doc = DOMUtils.readXml(new 
StringReader(r.getEntity().toString()));
+        String wadl = r.getEntity().toString();
+        //System.out.println(wadl);
+        Document doc = DOMUtils.readXml(new StringReader(wadl));
         checkGrammars(doc.getDocumentElement(), "thebook", "thebook2", 
"thechapter");
         List<Element> els = getWadlResourcesInfo(doc, 
"http://localhost:8080/baz";, 2);
         checkBookStoreInfo(els.get(0), "prefix1:thebook", "prefix1:thebook2", 
"prefix1:thechapter");