cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject git commit: [CXF-5948] Few more modifications
Date Fri, 22 Aug 2014 12:40:32 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 0a6d5eae9 -> 5d9af8f90


[CXF-5948] Few more modifications


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

Branch: refs/heads/master
Commit: 5d9af8f90f82f913681409d6a8ab13f2b1c12652
Parents: 0a6d5ea
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Fri Aug 22 13:40:11 2014 +0100
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Fri Aug 22 13:40:11 2014 +0100

----------------------------------------------------------------------
 .../org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java   | 8 ++++++--
 .../apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java    | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/5d9af8f9/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
----------------------------------------------------------------------
diff --git a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
index 6ec8dc1..1e6fa49 100644
--- a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
+++ b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
@@ -842,14 +842,18 @@ public class SourceGenerator {
             }
             if (!duplicate) {
                 if (inheritResourceParamsFirst && inheritedCount < inParamElements.size())
{
-                    inParamElements.set(inheritedCount, inherited);
+                    inParamElements.add(inheritedCount, inherited);
                 } else {
                     inParamElements.add(inherited);
                 }
                 inheritedCount++;
             }
         }
-        inheritedParams.addAll(newInheritedParams);
+        if (inheritResourceParamsFirst) {
+            inheritedParams.addAll(newInheritedParams);
+        } else {
+            inheritedParams.addAll(0, newInheritedParams);
+        }
         return inParamElements;
     }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/5d9af8f9/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java
----------------------------------------------------------------------
diff --git a/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java
b/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java
index c06a9f6..f947bcf 100644
--- a/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java
+++ b/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java
@@ -101,7 +101,7 @@ public class JAXRSContainerTest extends ProcessorTestBase {
             context.put(WadlToolConstants.CFG_SCHEMA_TYPE_MAP, 
                         "{http://www.w3.org/2001/XMLSchema}anyType=" 
                         + "java.io.InputStream");
-            context.put(WadlToolConstants.CFG_INHERIT_PARAMS, "=last");
+            context.put(WadlToolConstants.CFG_INHERIT_PARAMS, "last");
             
             container.setContext(context);
             container.execute();


Mime
View raw message