You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/03/07 12:54:55 UTC
[camel] 10/23: CAMEL-15520: fixed deprecations in camel-schematron
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 08d92d87e9cb01efc4939e1547890d3652a6de59
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Mar 7 11:53:16 2022 +0100
CAMEL-15520: fixed deprecations in camel-schematron
---
.../org/apache/camel/component/schematron/SchematronProducer.java | 4 ++--
.../camel/component/schematron/processor/SchematronProcessor.java | 3 ++-
.../org/apache/camel/component/schematron/SchematronEndpointTest.java | 3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronProducer.java b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronProducer.java
index eba770b..4d412bd 100644
--- a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronProducer.java
+++ b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronProducer.java
@@ -85,8 +85,8 @@ public class SchematronProducer extends DefaultProducer {
headers.put(Constants.VALIDATION_STATUS, status);
headers.put(Constants.VALIDATION_REPORT, report);
if (exchange.getPattern().isOutCapable()) {
- exchange.getOut().setHeaders(exchange.getIn().getHeaders());
- exchange.getOut().getHeaders().putAll(headers);
+ exchange.getMessage().setHeaders(exchange.getIn().getHeaders());
+ exchange.getMessage().getHeaders().putAll(headers);
} else {
exchange.getIn().getHeaders().putAll(headers);
}
diff --git a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/SchematronProcessor.java b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/SchematronProcessor.java
index dfc41cc..f90389f 100644
--- a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/SchematronProcessor.java
+++ b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/SchematronProcessor.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.schematron.processor;
import java.io.StringWriter;
+import java.nio.charset.Charset;
import javax.xml.transform.Source;
import javax.xml.transform.Templates;
@@ -61,7 +62,7 @@ public class SchematronProcessor {
* @return
*/
public String validate(final String xml) {
- final Source source = new SAXSource(reader, new InputSource(IOUtils.toInputStream(xml)));
+ final Source source = new SAXSource(reader, new InputSource(IOUtils.toInputStream(xml, Charset.defaultCharset())));
return validate(source);
}
diff --git a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronEndpointTest.java b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronEndpointTest.java
index 7aa76a1..8749f20 100644
--- a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronEndpointTest.java
+++ b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronEndpointTest.java
@@ -39,7 +39,8 @@ public class SchematronEndpointTest extends CamelTestSupport {
@Test
public void testSchematronFileReadFromClassPath() throws Exception {
- String payload = IOUtils.toString(ClassLoader.getSystemResourceAsStream("xml/article-1.xml"));
+ String payload = IOUtils.toString(ClassLoader.getSystemResourceAsStream("xml/article-1.xml"),
+ Charset.defaultCharset());
Endpoint endpoint = context().getEndpoint("schematron://sch/schematron-1.sch");
Producer producer = endpoint.createProducer();
Exchange exchange = new DefaultExchange(context, ExchangePattern.InOut);