You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2020/01/17 07:31:22 UTC
[camel] branch master updated (bf49e55 -> b4dfbaa)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from bf49e55 Improve EndpointDslMojo
new e49d301 CAMEL-14404 - Ignore xsi namespace attributes
new b4dfbaa Fix indentation for generated methods
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/java/org/apache/camel/xml/in/BaseParser.java | 4 ++++
.../camel/maven/packaging/ModelXmlParserGeneratorMojo.java | 10 +++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
[camel] 02/02: Fix indentation for generated methods
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b4dfbaaea996e7662a5aa1ea7dace959b4f403cd
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Thu Jan 16 17:45:20 2020 +0100
Fix indentation for generated methods
---
.../camel/maven/packaging/ModelXmlParserGeneratorMojo.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java
index 9956a49..b79e513 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java
@@ -444,27 +444,27 @@ public class ModelXmlParserGeneratorMojo extends AbstractGeneratorMojo {
}
if (hasDerived) {
if (!attributeMembers.isEmpty()) {
- parser.addMethod().setSignature(" protected <T extends " + qname + "> AttributeHandler<T> " + lowercase(name) + "AttributeHandler()")
+ parser.addMethod().setSignature("protected <T extends " + qname + "> AttributeHandler<T> " + lowercase(name) + "AttributeHandler()")
.setBody("return" + attributes + ";");
}
if (!elementMembers.isEmpty()) {
- parser.addMethod().setSignature(" protected <T extends " + qname + "> ElementHandler<T> " + lowercase(name) + "ElementHandler()")
+ parser.addMethod().setSignature("protected <T extends " + qname + "> ElementHandler<T> " + lowercase(name) + "ElementHandler()")
.setBody("return" + elements + ";");
}
if (!Modifier.isAbstract(clazz.getModifiers())) {
- parser.addMethod().setSignature(" protected " + qname + " doParse" + name + "() throws IOException, XmlPullParserException")
+ parser.addMethod().setSignature("protected " + qname + " doParse" + name + "() throws IOException, XmlPullParserException")
.setBody("return doParse(new " + qname + "(), " + (attributeMembers.isEmpty() ? attributes : lowercase(name) + "AttributeHandler()") + ", "
+ (elementMembers.isEmpty() ? elements : lowercase(name) + "ElementHandler()") + "," + value + ");\n");
}
} else {
- parser.addMethod().setSignature(" protected " + qname + " doParse" + name + "() throws IOException, XmlPullParserException")
+ parser.addMethod().setSignature("protected " + qname + " doParse" + name + "() throws IOException, XmlPullParserException")
.setBody("return doParse(new " + qname + "()," + attributes + "," + elements + "," + value + ");\n");
}
}
for (Class<?> root : elementRefs) {
parser.addMethod()
- .setSignature(" protected " + root.getSimpleName() + " doParse" + root.getSimpleName() + "Ref(String key) throws IOException, XmlPullParserException")
+ .setSignature("protected " + root.getSimpleName() + " doParse" + root.getSimpleName() + "Ref(String key) throws IOException, XmlPullParserException")
.setBody("switch (key) {\n" + model.stream().filter(root::isAssignableFrom).filter(cl -> cl.getAnnotation(XmlRootElement.class) != null).map(cl -> {
String en = cl.getAnnotation(XmlRootElement.class).name();
if ("##default".equals(en)) {
[camel] 01/02: CAMEL-14404 - Ignore xsi namespace attributes
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e49d3015f2d3dc17661fe8cb0aa7d30960b0bc0c
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jan 17 08:30:39 2020 +0100
CAMEL-14404 - Ignore xsi namespace attributes
---
.../src/main/java/org/apache/camel/xml/in/BaseParser.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/core/camel-xml-io/src/main/java/org/apache/camel/xml/in/BaseParser.java b/core/camel-xml-io/src/main/java/org/apache/camel/xml/in/BaseParser.java
index d833faa..f51bb14 100644
--- a/core/camel-xml-io/src/main/java/org/apache/camel/xml/in/BaseParser.java
+++ b/core/camel-xml-io/src/main/java/org/apache/camel/xml/in/BaseParser.java
@@ -198,6 +198,10 @@ public class BaseParser {
}
protected void handleOtherAttribute(Object definition, String name, String ns, String val) throws XmlPullParserException {
+ // Ignore
+ if ("http://www.w3.org/2001/XMLSchema-instance".equals(ns)) {
+ return;
+ }
if (definition instanceof OtherAttributesAware) {
Map<QName, Object> others = ((OtherAttributesAware)definition).getOtherAttributes();
if (others == null) {