Repository: cxf Updated Branches: refs/heads/2.7.x-fixes ee6c9257e -> e9836d93f
[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/e9836d93 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e9836d93 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e9836d93 Branch: refs/heads/2.7.x-fixes Commit: e9836d93f403f667be901644fcded6c2424d0a13 Parents: ee6c925 Author: Sergey Beryozkin <sberyoz...@talend.com> Authored: Fri Aug 22 13:40:11 2014 +0100 Committer: Sergey Beryozkin <sberyoz...@talend.com> Committed: Fri Aug 22 13:42:55 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/e9836d93/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 a9be7e6..22d8f86 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 @@ -834,14 +834,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/e9836d93/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();
