Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C493218DE6 for ; Mon, 11 May 2015 15:02:44 +0000 (UTC) Received: (qmail 74829 invoked by uid 500); 11 May 2015 15:00:25 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 74031 invoked by uid 500); 11 May 2015 15:00:24 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 68630 invoked by uid 99); 11 May 2015 14:58:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 May 2015 14:58:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CBBB2E056A; Mon, 11 May 2015 14:58:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ay@apache.org To: commits@cxf.apache.org Message-Id: <3fb286f13ff7424cb86a7c97e2ddf3d5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: [CXF-6399] Add attributes transform handling in transform feature Date: Mon, 11 May 2015 14:58:27 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/3.0.x-fixes f6c97d3a8 -> 31671c3d5 [CXF-6399] Add attributes transform handling in transform feature Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/31671c3d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/31671c3d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/31671c3d Branch: refs/heads/3.0.x-fixes Commit: 31671c3d571a3a5edf4a85cd25bf536091e27902 Parents: f6c97d3 Author: Akitoshi Yoshida Authored: Mon May 11 16:55:29 2015 +0200 Committer: Akitoshi Yoshida Committed: Mon May 11 16:58:06 2015 +0200 ---------------------------------------------------------------------- .../cxf/feature/StaxTransformFeature.java | 12 ++++++++-- .../transform/TransformInInterceptor.java | 12 +++++++--- .../transform/TransformOutInterceptor.java | 6 +++++ .../cxf/staxutils/transform/TransformUtils.java | 23 ++++++++++++++++++-- 4 files changed, 46 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/31671c3d/core/src/main/java/org/apache/cxf/feature/StaxTransformFeature.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/feature/StaxTransformFeature.java b/core/src/main/java/org/apache/cxf/feature/StaxTransformFeature.java index eb1392a..2a9bf83 100644 --- a/core/src/main/java/org/apache/cxf/feature/StaxTransformFeature.java +++ b/core/src/main/java/org/apache/cxf/feature/StaxTransformFeature.java @@ -59,7 +59,11 @@ public class StaxTransformFeature extends AbstractFeature { public void setOutTransformElements(Map outElements) { out.setOutTransformElements(outElements); } - + + public void setOutTransformAttributes(Map outAttributes) { + out.setOutTransformAttributes(outAttributes); + } + public void setAttributesToElements(boolean value) { out.setAttributesToElements(value); } @@ -75,7 +79,7 @@ public class StaxTransformFeature extends AbstractFeature { public void setOutDropElements(List dropElementsSet) { out.setOutDropElements(dropElementsSet); } - + public void setInAppendElements(Map inElements) { in.setInAppendElements(inElements); } @@ -88,6 +92,10 @@ public class StaxTransformFeature extends AbstractFeature { in.setInTransformElements(inElements); } + public void setInTransformAttributes(Map inAttributes) { + in.setInTransformAttributes(inAttributes); + } + public void setOutDefaultNamespace(String ns) { out.setDefaultNamespace(ns); } http://git-wip-us.apache.org/repos/asf/cxf/blob/31671c3d/core/src/main/java/org/apache/cxf/interceptor/transform/TransformInInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/interceptor/transform/TransformInInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/transform/TransformInInterceptor.java index a481f6a..fab2026 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/transform/TransformInInterceptor.java +++ b/core/src/main/java/org/apache/cxf/interceptor/transform/TransformInInterceptor.java @@ -42,6 +42,7 @@ public class TransformInInterceptor extends AbstractPhaseInterceptor { private List inDropElements; private Map inElementsMap; private Map inAppendMap; + private Map inAttributesMap; private boolean blockOriginalReader = true; private String contextPropertyName; @@ -82,15 +83,16 @@ public class TransformInInterceptor extends AbstractPhaseInterceptor { } } - + protected XMLStreamReader createTransformReaderIfNeeded(XMLStreamReader reader, InputStream is) { return TransformUtils.createTransformReaderIfNeeded(reader, is, inDropElements, inElementsMap, inAppendMap, + inAttributesMap, blockOriginalReader); } - + public void setInAppendElements(Map inElements) { this.inAppendMap = inElements; } @@ -102,7 +104,11 @@ public class TransformInInterceptor extends AbstractPhaseInterceptor { public void setInTransformElements(Map inElements) { this.inElementsMap = inElements; } - + + public void setInTransformAttributes(Map inAttributes) { + this.inAttributesMap = inAttributes; + } + public void setBlockOriginalReader(boolean blockOriginalReader) { this.blockOriginalReader = blockOriginalReader; } http://git-wip-us.apache.org/repos/asf/cxf/blob/31671c3d/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java index 49156d5..a0fff5b 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java +++ b/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java @@ -50,6 +50,7 @@ public class TransformOutInterceptor extends AbstractPhaseInterceptor { private Map outElementsMap; private Map outAppendMap; private List outDropElements; + private Map outAttributesMap; private boolean attributesToElements; private boolean skipOnFault; private String contextPropertyName; @@ -112,6 +113,7 @@ public class TransformOutInterceptor extends AbstractPhaseInterceptor { outElementsMap, outDropElements, outAppendMap, + outAttributesMap, attributesToElements, defaultNamespace); } @@ -128,6 +130,10 @@ public class TransformOutInterceptor extends AbstractPhaseInterceptor { this.outDropElements = dropElementsSet; } + public void setOutTransformAttributes(Map outAttributes) { + this.outAttributesMap = outAttributes; + } + public void setAttributesToElements(boolean value) { this.attributesToElements = value; } http://git-wip-us.apache.org/repos/asf/cxf/blob/31671c3d/core/src/main/java/org/apache/cxf/staxutils/transform/TransformUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/staxutils/transform/TransformUtils.java b/core/src/main/java/org/apache/cxf/staxutils/transform/TransformUtils.java index 1553527..9dc2649 100644 --- a/core/src/main/java/org/apache/cxf/staxutils/transform/TransformUtils.java +++ b/core/src/main/java/org/apache/cxf/staxutils/transform/TransformUtils.java @@ -57,11 +57,30 @@ public final class TransformUtils { || outAppendMap != null || attributesToElements) { writer = createNewWriterIfNeeded(writer, os); writer = new OutTransformWriter(writer, outElementsMap, outAppendMap, - outDropElements, attributesToElements, defaultNamespace); + outDropElements, null, attributesToElements, defaultNamespace); } return writer; } - + + //CHECKSTYLE:OFF ParameterNumber + public static XMLStreamWriter createTransformWriterIfNeeded(XMLStreamWriter writer, + OutputStream os, + Map outElementsMap, + List outDropElements, + Map outAppendMap, + Map outAttributesMap, + boolean attributesToElements, + String defaultNamespace) { + if (outElementsMap != null || outDropElements != null + || outAppendMap != null || attributesToElements) { + writer = createNewWriterIfNeeded(writer, os); + writer = new OutTransformWriter(writer, outElementsMap, outAppendMap, + outDropElements, outAttributesMap, attributesToElements, defaultNamespace); + } + return writer; + } + //CHECKSTYLE:ON + public static XMLStreamReader createTransformReaderIfNeeded(XMLStreamReader reader, InputStream is, List inDropElements,