[jira] [Commented] (CAMEL-12415) Camel-jaxb option "encoding" with option "filterNonXmlChars" generate wrong data
[
https://issues.apache.org/jira/browse/CAMEL-12415?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16424544#comment-16424544
]
ASF GitHub Bot commented on CAMEL-12415:
aldettinger commented on issue #2277: CAMEL-12415 - camel-jaxb, fix options
combination: encoding,filterNon…
URL: https://github.com/apache/camel/pull/2277#issuecomment-378385093
Merged into master. Thanks for contribution :+1: .
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> Camel-jaxb option "encoding" with option "filterNonXmlChars" generate wrong
> data
>
>
> Key: CAMEL-12415
> URL: https://issues.apache.org/jira/browse/CAMEL-12415
> Project: Camel
> Issue Type: Bug
> Components: camel-jaxb
>Affects Versions: 2.21.0
> Environment: OS X 13.3, Java 8
>Reporter: Jonas Waage
>Assignee: Alex Dettinger
>Priority: Minor
> Fix For: 2.22.0
>
>
> When using the jaxb-component to marshal.
> The properties:
> * Encoding
> * FilterNonXmlChars
> do not work together correctly.
> FilterNonXmlChars will ignore the set encoding, and make the output bytes
> UTF-8 encoded.
> I would either expect this to just work, and by that I mean bytes should be
> encoded as the set encoding, or minimally fail during startup of the route
> with an exception explaining that these properties does not work together.
> I'd really prefer the first, since I want to use the functionality of both.
> I have provided a patch which makes this work.I have done a small refactoring
> to not have to duplicate more code. I can rewrite this if it is a problem.
> Below is a test which will reproduce the problem.
> {code:java}
> public class ExplicitEncodingAndXMLCharFilteringTest extends CamelTestSupport
> {
> @Override
> public void setUp() throws Exception {
> deleteDirectory("target/charset");
> super.setUp();
> }
> @Test
> public void testIsoAndCharacterFiltering() throws Exception {
> PurchaseOrder order = new PurchaseOrder();
> //Data containing characters ÆØÅæøå that differ in utf-8 and iso + a
> spouting whale
> String name =
> "\u00c6\u00d8\u00C5\u00e6\u00f8\u00e5\uD83D\uDC33\uFFFD";
> String expected = "\u00c6\u00d8\u00C5\u00e6\u00f8\u00e5 \uFFFD";
> //Spouting whale has become spaces
> order.setName(name);
> order.setAmount(123.45);
> order.setPrice(2.22);
> MockEndpoint result = getMockEndpoint("mock:file");
> result.expectedFileExists("target/charset/output.xml");
> template.sendBody("direct:start", order);
> assertMockEndpointsSatisfied();
> JAXBContext jaxbContext =
> JAXBContext.newInstance("org.apache.camel.example");
> Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
> InputStream inputStream = new
> FileInputStream("target/charset/output.xml");
> Reader reader = new InputStreamReader(inputStream, "ISO-8859-1");
> PurchaseOrder obj = (PurchaseOrder) unmarshaller.unmarshal(reader);
> assertEquals(expected, obj.getName());
> }
> @Override
> protected RouteBuilder createRouteBuilder() throws Exception {
> return new RouteBuilder() {
> @Override
> public void configure() throws Exception {
> JaxbDataFormat jaxb = new
> JaxbDataFormat("org.apache.camel.example");
> jaxb.setFilterNonXmlChars(true);
> jaxb.setEncoding("iso-8859-1");
> from("direct:start")
> .marshal(jaxb)
>
> .to("file:target/charset/?fileName=output.xml&charset=iso-8859-1");
> }
> };
> }
> {code}
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[jira] [Commented] (CAMEL-12415) Camel-jaxb option "encoding" with option "filterNonXmlChars" generate wrong data
[
https://issues.apache.org/jira/browse/CAMEL-12415?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16424546#comment-16424546
]
ASF GitHub Bot commented on CAMEL-12415:
Github user aldettinger closed the pull request at:
https://github.com/apache/camel/pull/2277
> Camel-jaxb option "encoding" with option "filterNonXmlChars" generate wrong
> data
>
>
> Key: CAMEL-12415
> URL: https://issues.apache.org/jira/browse/CAMEL-12415
> Project: Camel
> Issue Type: Bug
> Components: camel-jaxb
>Affects Versions: 2.21.0
> Environment: OS X 13.3, Java 8
>Reporter: Jonas Waage
>Assignee: Alex Dettinger
>Priority: Minor
> Fix For: 2.22.0
>
>
> When using the jaxb-component to marshal.
> The properties:
> * Encoding
> * FilterNonXmlChars
> do not work together correctly.
> FilterNonXmlChars will ignore the set encoding, and make the output bytes
> UTF-8 encoded.
> I would either expect this to just work, and by that I mean bytes should be
> encoded as the set encoding, or minimally fail during startup of the route
> with an exception explaining that these properties does not work together.
> I'd really prefer the first, since I want to use the functionality of both.
> I have provided a patch which makes this work.I have done a small refactoring
> to not have to duplicate more code. I can rewrite this if it is a problem.
> Below is a test which will reproduce the problem.
> {code:java}
> public class ExplicitEncodingAndXMLCharFilteringTest extends CamelTestSupport
> {
> @Override
> public void setUp() throws Exception {
> deleteDirectory("target/charset");
> super.setUp();
> }
> @Test
> public void testIsoAndCharacterFiltering() throws Exception {
> PurchaseOrder order = new PurchaseOrder();
> //Data containing characters ÆØÅæøå that differ in utf-8 and iso + a
> spouting whale
> String name =
> "\u00c6\u00d8\u00C5\u00e6\u00f8\u00e5\uD83D\uDC33\uFFFD";
> String expected = "\u00c6\u00d8\u00C5\u00e6\u00f8\u00e5 \uFFFD";
> //Spouting whale has become spaces
> order.setName(name);
> order.setAmount(123.45);
> order.setPrice(2.22);
> MockEndpoint result = getMockEndpoint("mock:file");
> result.expectedFileExists("target/charset/output.xml");
> template.sendBody("direct:start", order);
> assertMockEndpointsSatisfied();
> JAXBContext jaxbContext =
> JAXBContext.newInstance("org.apache.camel.example");
> Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
> InputStream inputStream = new
> FileInputStream("target/charset/output.xml");
> Reader reader = new InputStreamReader(inputStream, "ISO-8859-1");
> PurchaseOrder obj = (PurchaseOrder) unmarshaller.unmarshal(reader);
> assertEquals(expected, obj.getName());
> }
> @Override
> protected RouteBuilder createRouteBuilder() throws Exception {
> return new RouteBuilder() {
> @Override
> public void configure() throws Exception {
> JaxbDataFormat jaxb = new
> JaxbDataFormat("org.apache.camel.example");
> jaxb.setFilterNonXmlChars(true);
> jaxb.setEncoding("iso-8859-1");
> from("direct:start")
> .marshal(jaxb)
>
> .to("file:target/charset/?fileName=output.xml&charset=iso-8859-1");
> }
> };
> }
> {code}
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[jira] [Commented] (CAMEL-12415) Camel-jaxb option "encoding" with option "filterNonXmlChars" generate wrong data
[
https://issues.apache.org/jira/browse/CAMEL-12415?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16424545#comment-16424545
]
ASF GitHub Bot commented on CAMEL-12415:
aldettinger closed pull request #2277: CAMEL-12415 - camel-jaxb, fix options
combination: encoding,filterNon…
URL: https://github.com/apache/camel/pull/2277
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
index 8283af650a4..b2ec41bd23f 100644
---
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
+++
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
@@ -298,8 +298,9 @@ protected void doStop() throws Exception {
if (isPrettyPrint()) {
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT,
Boolean.TRUE);
}
-if (exchange != null &&
exchange.getProperty(Exchange.CHARSET_NAME, String.class) != null) {
-marshaller.setProperty(Marshaller.JAXB_ENCODING,
exchange.getProperty(Exchange.CHARSET_NAME, String.class));
+String charset = exchange != null ?
exchange.getProperty(Exchange.CHARSET_NAME, String.class) : null;
+if (charset != null) {
+marshaller.setProperty(Marshaller.JAXB_ENCODING, charset);
}
Object toMarshall = value;
if (objectFactoryMethod != null) {
@@ -314,7 +315,7 @@ protected void doStop() throws Exception {
}
if (needFiltering(exchange)) {
XMLStreamWriter writer =
parentTypeConverter.convertTo(XMLStreamWriter.class, buffer);
-FilteringXmlStreamWriter filteringWriter = new
FilteringXmlStreamWriter(writer);
+FilteringXmlStreamWriter filteringWriter = new
FilteringXmlStreamWriter(writer, charset);
marshaller.marshal(toMarshall, filteringWriter);
} else {
marshaller.marshal(toMarshall, buffer);
diff --git
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FilteringXmlStreamWriter.java
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FilteringXmlStreamWriter.java
index 7af3d727702..3a82b1443cd 100644
---
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FilteringXmlStreamWriter.java
+++
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FilteringXmlStreamWriter.java
@@ -36,6 +36,7 @@
NonXmlCharFilterer nonXmlCharFilterer = new NonXmlCharFilterer();
private XMLStreamWriter writer;
+private String encoding;
/**
* @param writer
@@ -45,6 +46,18 @@ public FilteringXmlStreamWriter(XMLStreamWriter writer) {
this.writer = writer;
}
+/**
+ * @param writer
+ *target writer to wrap.
+ * @param encoding
+ *the encoding to write in the xml prolog.
+ *
+ */
+public FilteringXmlStreamWriter(XMLStreamWriter writer, String encoding) {
+this.writer = writer;
+this.encoding = encoding;
+}
+
/**
* This method applies filtering before delegating call to {@link #writer}.
*/
@@ -181,7 +194,11 @@ public void writeProcessingInstruction(String target)
throws XMLStreamException
}
public void writeStartDocument() throws XMLStreamException {
-writer.writeStartDocument();
+if (encoding != null) {
+this.writeStartDocument(encoding, null);
+} else {
+writer.writeStartDocument();
+}
}
public void writeStartDocument(String encoding, String version) throws
XMLStreamException {
@@ -189,7 +206,11 @@ public void writeStartDocument(String encoding, String
version) throws XMLStream
}
public void writeStartDocument(String version) throws XMLStreamException {
-writer.writeStartDocument(version);
+if (encoding != null) {
+this.writeStartDocument(encoding, version);
+} else {
+writer.writeStartDocument(version);
+}
}
public void writeStartElement(String prefix, String localName, String
namespaceURI)
diff --git
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
index ea74d37dad5..35a208aa4e2 100644
---
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.jav
[jira] [Closed] (CAMEL-12415) Camel-jaxb option "encoding" with option "filterNonXmlChars" generate wrong data
[
https://issues.apache.org/jira/browse/CAMEL-12415?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Alex Dettinger closed CAMEL-12415.
--
Resolution: Fixed
Fix Version/s: 2.22.0
> Camel-jaxb option "encoding" with option "filterNonXmlChars" generate wrong
> data
>
>
> Key: CAMEL-12415
> URL: https://issues.apache.org/jira/browse/CAMEL-12415
> Project: Camel
> Issue Type: Bug
> Components: camel-jaxb
>Affects Versions: 2.21.0
> Environment: OS X 13.3, Java 8
>Reporter: Jonas Waage
>Assignee: Alex Dettinger
>Priority: Minor
> Fix For: 2.22.0
>
>
> When using the jaxb-component to marshal.
> The properties:
> * Encoding
> * FilterNonXmlChars
> do not work together correctly.
> FilterNonXmlChars will ignore the set encoding, and make the output bytes
> UTF-8 encoded.
> I would either expect this to just work, and by that I mean bytes should be
> encoded as the set encoding, or minimally fail during startup of the route
> with an exception explaining that these properties does not work together.
> I'd really prefer the first, since I want to use the functionality of both.
> I have provided a patch which makes this work.I have done a small refactoring
> to not have to duplicate more code. I can rewrite this if it is a problem.
> Below is a test which will reproduce the problem.
> {code:java}
> public class ExplicitEncodingAndXMLCharFilteringTest extends CamelTestSupport
> {
> @Override
> public void setUp() throws Exception {
> deleteDirectory("target/charset");
> super.setUp();
> }
> @Test
> public void testIsoAndCharacterFiltering() throws Exception {
> PurchaseOrder order = new PurchaseOrder();
> //Data containing characters ÆØÅæøå that differ in utf-8 and iso + a
> spouting whale
> String name =
> "\u00c6\u00d8\u00C5\u00e6\u00f8\u00e5\uD83D\uDC33\uFFFD";
> String expected = "\u00c6\u00d8\u00C5\u00e6\u00f8\u00e5 \uFFFD";
> //Spouting whale has become spaces
> order.setName(name);
> order.setAmount(123.45);
> order.setPrice(2.22);
> MockEndpoint result = getMockEndpoint("mock:file");
> result.expectedFileExists("target/charset/output.xml");
> template.sendBody("direct:start", order);
> assertMockEndpointsSatisfied();
> JAXBContext jaxbContext =
> JAXBContext.newInstance("org.apache.camel.example");
> Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
> InputStream inputStream = new
> FileInputStream("target/charset/output.xml");
> Reader reader = new InputStreamReader(inputStream, "ISO-8859-1");
> PurchaseOrder obj = (PurchaseOrder) unmarshaller.unmarshal(reader);
> assertEquals(expected, obj.getName());
> }
> @Override
> protected RouteBuilder createRouteBuilder() throws Exception {
> return new RouteBuilder() {
> @Override
> public void configure() throws Exception {
> JaxbDataFormat jaxb = new
> JaxbDataFormat("org.apache.camel.example");
> jaxb.setFilterNonXmlChars(true);
> jaxb.setEncoding("iso-8859-1");
> from("direct:start")
> .marshal(jaxb)
>
> .to("file:target/charset/?fileName=output.xml&charset=iso-8859-1");
> }
> };
> }
> {code}
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[jira] [Assigned] (CAMEL-12415) Camel-jaxb option "encoding" with option "filterNonXmlChars" generate wrong data
[
https://issues.apache.org/jira/browse/CAMEL-12415?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Alex Dettinger reassigned CAMEL-12415:
--
Assignee: Alex Dettinger
> Camel-jaxb option "encoding" with option "filterNonXmlChars" generate wrong
> data
>
>
> Key: CAMEL-12415
> URL: https://issues.apache.org/jira/browse/CAMEL-12415
> Project: Camel
> Issue Type: Bug
> Components: camel-jaxb
>Affects Versions: 2.21.0
> Environment: OS X 13.3, Java 8
>Reporter: Jonas Waage
>Assignee: Alex Dettinger
>Priority: Minor
>
> When using the jaxb-component to marshal.
> The properties:
> * Encoding
> * FilterNonXmlChars
> do not work together correctly.
> FilterNonXmlChars will ignore the set encoding, and make the output bytes
> UTF-8 encoded.
> I would either expect this to just work, and by that I mean bytes should be
> encoded as the set encoding, or minimally fail during startup of the route
> with an exception explaining that these properties does not work together.
> I'd really prefer the first, since I want to use the functionality of both.
> I have provided a patch which makes this work.I have done a small refactoring
> to not have to duplicate more code. I can rewrite this if it is a problem.
> Below is a test which will reproduce the problem.
> {code:java}
> public class ExplicitEncodingAndXMLCharFilteringTest extends CamelTestSupport
> {
> @Override
> public void setUp() throws Exception {
> deleteDirectory("target/charset");
> super.setUp();
> }
> @Test
> public void testIsoAndCharacterFiltering() throws Exception {
> PurchaseOrder order = new PurchaseOrder();
> //Data containing characters ÆØÅæøå that differ in utf-8 and iso + a
> spouting whale
> String name =
> "\u00c6\u00d8\u00C5\u00e6\u00f8\u00e5\uD83D\uDC33\uFFFD";
> String expected = "\u00c6\u00d8\u00C5\u00e6\u00f8\u00e5 \uFFFD";
> //Spouting whale has become spaces
> order.setName(name);
> order.setAmount(123.45);
> order.setPrice(2.22);
> MockEndpoint result = getMockEndpoint("mock:file");
> result.expectedFileExists("target/charset/output.xml");
> template.sendBody("direct:start", order);
> assertMockEndpointsSatisfied();
> JAXBContext jaxbContext =
> JAXBContext.newInstance("org.apache.camel.example");
> Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
> InputStream inputStream = new
> FileInputStream("target/charset/output.xml");
> Reader reader = new InputStreamReader(inputStream, "ISO-8859-1");
> PurchaseOrder obj = (PurchaseOrder) unmarshaller.unmarshal(reader);
> assertEquals(expected, obj.getName());
> }
> @Override
> protected RouteBuilder createRouteBuilder() throws Exception {
> return new RouteBuilder() {
> @Override
> public void configure() throws Exception {
> JaxbDataFormat jaxb = new
> JaxbDataFormat("org.apache.camel.example");
> jaxb.setFilterNonXmlChars(true);
> jaxb.setEncoding("iso-8859-1");
> from("direct:start")
> .marshal(jaxb)
>
> .to("file:target/charset/?fileName=output.xml&charset=iso-8859-1");
> }
> };
> }
> {code}
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[jira] [Commented] (CAMEL-12415) Camel-jaxb option "encoding" with option "filterNonXmlChars" generate wrong data
[
https://issues.apache.org/jira/browse/CAMEL-12415?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16423941#comment-16423941
]
ASF GitHub Bot commented on CAMEL-12415:
oscerd commented on issue #2277: CAMEL-12415 - camel-jaxb, fix options
combination: encoding,filterNon…
URL: https://github.com/apache/camel/pull/2277#issuecomment-378232536
@aldettinger can you review? It looks good to me.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> Camel-jaxb option "encoding" with option "filterNonXmlChars" generate wrong
> data
>
>
> Key: CAMEL-12415
> URL: https://issues.apache.org/jira/browse/CAMEL-12415
> Project: Camel
> Issue Type: Bug
> Components: camel-jaxb
>Affects Versions: 2.21.0
> Environment: OS X 13.3, Java 8
>Reporter: Jonas Waage
>Priority: Minor
>
> When using the jaxb-component to marshal.
> The properties:
> * Encoding
> * FilterNonXmlChars
> do not work together correctly.
> FilterNonXmlChars will ignore the set encoding, and make the output bytes
> UTF-8 encoded.
> I would either expect this to just work, and by that I mean bytes should be
> encoded as the set encoding, or minimally fail during startup of the route
> with an exception explaining that these properties does not work together.
> I'd really prefer the first, since I want to use the functionality of both.
> I have provided a patch which makes this work.I have done a small refactoring
> to not have to duplicate more code. I can rewrite this if it is a problem.
> Below is a test which will reproduce the problem.
> {code:java}
> public class ExplicitEncodingAndXMLCharFilteringTest extends CamelTestSupport
> {
> @Override
> public void setUp() throws Exception {
> deleteDirectory("target/charset");
> super.setUp();
> }
> @Test
> public void testIsoAndCharacterFiltering() throws Exception {
> PurchaseOrder order = new PurchaseOrder();
> //Data containing characters ÆØÅæøå that differ in utf-8 and iso + a
> spouting whale
> String name =
> "\u00c6\u00d8\u00C5\u00e6\u00f8\u00e5\uD83D\uDC33\uFFFD";
> String expected = "\u00c6\u00d8\u00C5\u00e6\u00f8\u00e5 \uFFFD";
> //Spouting whale has become spaces
> order.setName(name);
> order.setAmount(123.45);
> order.setPrice(2.22);
> MockEndpoint result = getMockEndpoint("mock:file");
> result.expectedFileExists("target/charset/output.xml");
> template.sendBody("direct:start", order);
> assertMockEndpointsSatisfied();
> JAXBContext jaxbContext =
> JAXBContext.newInstance("org.apache.camel.example");
> Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
> InputStream inputStream = new
> FileInputStream("target/charset/output.xml");
> Reader reader = new InputStreamReader(inputStream, "ISO-8859-1");
> PurchaseOrder obj = (PurchaseOrder) unmarshaller.unmarshal(reader);
> assertEquals(expected, obj.getName());
> }
> @Override
> protected RouteBuilder createRouteBuilder() throws Exception {
> return new RouteBuilder() {
> @Override
> public void configure() throws Exception {
> JaxbDataFormat jaxb = new
> JaxbDataFormat("org.apache.camel.example");
> jaxb.setFilterNonXmlChars(true);
> jaxb.setEncoding("iso-8859-1");
> from("direct:start")
> .marshal(jaxb)
>
> .to("file:target/charset/?fileName=output.xml&charset=iso-8859-1");
> }
> };
> }
> {code}
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[jira] [Resolved] (CAMEL-12387) Spring Boot 2 - Update readme's and documentation
[ https://issues.apache.org/jira/browse/CAMEL-12387?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nicola Ferraro resolved CAMEL-12387. Resolution: Fixed > Spring Boot 2 - Update readme's and documentation > - > > Key: CAMEL-12387 > URL: https://issues.apache.org/jira/browse/CAMEL-12387 > Project: Camel > Issue Type: Sub-task > Components: documentation >Reporter: Claus Ibsen >Assignee: Nicola Ferraro >Priority: Major > Fix For: 2.22.0 > > > In the src/main/docs folder of camel-spring-boot we should update that for > SB2. > Also there may be a slight chance that the readme files for the SB examples > that need a bit of update. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
