You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2021/12/14 13:25:21 UTC
[camel] branch main updated (8f5d6c5 -> 355f01b)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 8f5d6c5 Sync deps
new ab9f776 CAMEL-17331: camel-core - Add line number metadata to model
new 1ca215a CAMEL-17331: add line number to model with camel-yaml-dsl
new 283ac91 CAMEL-17331: include sourceLineNumber in xml dump if possible
new 97d1566 CAMEL-17331: add line number to model with camel-xml-io
new 8ca47d2 Fixed NPE in ManagedLog
new cf1412f CAMEL-17331: include source location and line number to processor mbeans
new 355f01b CAMEL-17331: include sourceLineNumber in xml dump if possible. Remove as we need a better way.
The 7 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:
.../{RouteAware.java => LineNumberAware.java} | 18 +++++-----
.../src/main/java/org/apache/camel/NamedNode.java | 2 +-
.../camel/model/OptionalIdentifiedDefinition.java | 13 +++++++
.../org/apache/camel/processor/LogProcessor.java | 4 +++
.../management/mbean/ManagedProcessorMBean.java | 6 ++++
.../apache/camel/management/mbean/ManagedLog.java | 6 +++-
.../camel/management/mbean/ManagedProcessor.java | 17 +++++++++
.../java/org/apache/camel/xml/in/BaseParser.java | 8 ++---
.../org/apache/camel/xml/in/ModelParserTest.java | 15 ++++++++
.../dsl/yaml/common/YamlDeserializerBase.java | 9 ++++-
.../deserializers/FromDefinitionDeserializer.java | 10 +++++-
.../OutputAwareFromDefinitionDeserializer.java | 18 +++++++---
.../yaml/{LogTest.groovy => LineNumberTest.groovy} | 42 ++++++++++++++++++++--
13 files changed, 144 insertions(+), 24 deletions(-)
copy core/camel-api/src/main/java/org/apache/camel/{RouteAware.java => LineNumberAware.java} (64%)
copy dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/{LogTest.groovy => LineNumberTest.groovy} (55%)
[camel] 02/07: CAMEL-17331: add line number to model with camel-yaml-dsl
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1ca215a59bb27582990f3bb669672dcdbfd0e836
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 14 12:56:41 2021 +0100
CAMEL-17331: add line number to model with camel-yaml-dsl
---
.../dsl/yaml/common/YamlDeserializerBase.java | 9 ++-
.../deserializers/FromDefinitionDeserializer.java | 10 ++-
.../OutputAwareFromDefinitionDeserializer.java | 18 +++--
.../apache/camel/dsl/yaml/LineNumberTest.groovy | 81 ++++++++++++++++++++++
4 files changed, 112 insertions(+), 6 deletions(-)
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/main/java/org/apache/camel/dsl/yaml/common/YamlDeserializerBase.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/main/java/org/apache/camel/dsl/yaml/common/YamlDeserializerBase.java
index 02ec14a..7e6ccdd 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/main/java/org/apache/camel/dsl/yaml/common/YamlDeserializerBase.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/main/java/org/apache/camel/dsl/yaml/common/YamlDeserializerBase.java
@@ -18,6 +18,7 @@ package org.apache.camel.dsl.yaml.common;
import java.util.Locale;
+import org.apache.camel.LineNumberAware;
import org.apache.camel.util.StringHelper;
import org.snakeyaml.engine.v2.api.ConstructNode;
import org.snakeyaml.engine.v2.nodes.MappingNode;
@@ -47,12 +48,18 @@ public abstract class YamlDeserializerBase<T> extends YamlDeserializerSupport im
} else if (node.getNodeType() == NodeType.MAPPING) {
MappingNode mn = (MappingNode) node;
target = newInstance();
-
setProperties(target, mn);
} else {
throw new IllegalArgumentException("Unsupported node type: " + node);
}
+ // enrich model with line number
+ if (target instanceof LineNumberAware && node.getStartMark().isPresent()) {
+ int line = node.getStartMark().get().getLine();
+ LineNumberAware lna = (LineNumberAware) target;
+ lna.setLineNumber(line);
+ }
+
return target;
}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/FromDefinitionDeserializer.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/FromDefinitionDeserializer.java
index 4df8ddf..ef1767f 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/FromDefinitionDeserializer.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/FromDefinitionDeserializer.java
@@ -33,13 +33,21 @@ import org.snakeyaml.engine.v2.nodes.Node;
@YamlProperty(name = "parameters", type = "object")
})
public class FromDefinitionDeserializer implements ConstructNode {
+
@Override
public Object construct(Node node) {
String uri = YamlSupport.creteEndpointUri(node, EndpointConsumerDeserializersResolver::resolveEndpointUri);
if (uri == null) {
throw new IllegalStateException("The endpoint URI must be set");
}
+ FromDefinition target = new FromDefinition(uri);
+
+ // enrich model with line number
+ if (node.getStartMark().isPresent()) {
+ int line = node.getStartMark().get().getLine();
+ target.setLineNumber(line);
+ }
- return new FromDefinition(uri);
+ return target;
}
}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/OutputAwareFromDefinitionDeserializer.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/OutputAwareFromDefinitionDeserializer.java
index c0c81ac..55ab042 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/OutputAwareFromDefinitionDeserializer.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/OutputAwareFromDefinitionDeserializer.java
@@ -82,7 +82,13 @@ public class OutputAwareFromDefinitionDeserializer extends YamlDeserializerBase<
if (uri != null || properties != null) {
throw new IllegalArgumentException("uri and properties are not supported when using Endpoint DSL ");
}
- target.setDelegate(new FromDefinition(endpointUri));
+ FromDefinition from = new FromDefinition(endpointUri);
+ // enrich model with line number
+ if (node.getStartMark().isPresent()) {
+ int line = node.getStartMark().get().getLine();
+ from.setLineNumber(line);
+ }
+ target.setDelegate(from);
} else {
throw new IllegalArgumentException("Unsupported field: " + key);
}
@@ -91,9 +97,13 @@ public class OutputAwareFromDefinitionDeserializer extends YamlDeserializerBase<
if (target.getDelegate() == null) {
ObjectHelper.notNull("uri", "The uri must set");
-
- target.setDelegate(
- new FromDefinition(YamlSupport.createEndpointUri(dc.getCamelContext(), uri, properties)));
+ FromDefinition from = new FromDefinition(YamlSupport.createEndpointUri(dc.getCamelContext(), uri, properties));
+ // enrich model with line number
+ if (node.getStartMark().isPresent()) {
+ int line = node.getStartMark().get().getLine();
+ from.setLineNumber(line);
+ }
+ target.setDelegate(from);
}
}
}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LineNumberTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LineNumberTest.groovy
new file mode 100644
index 0000000..402e280
--- /dev/null
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LineNumberTest.groovy
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.dsl.yaml
+
+import org.apache.camel.dsl.yaml.support.YamlTestSupport
+import org.apache.camel.model.FromDefinition
+import org.apache.camel.model.LogDefinition
+import org.apache.camel.model.RouteDefinition
+import org.apache.camel.model.ToDefinition
+
+class LineNumberTest extends YamlTestSupport {
+
+ def "line number definition"() {
+ when:
+ loadRoutes '''
+ - from:
+ uri: "direct:start"
+ steps:
+ - log:
+ logging-level: "ERROR"
+ message: "test"
+ log-name: "yaml"
+ - to: "direct:result"
+ '''
+ then:
+ context.routeDefinitions.size() == 1
+
+ with(context.routeDefinitions[0].input, FromDefinition) {
+ uri == "direct:start"
+ lineNumber == 2
+ }
+ with(context.routeDefinitions[0].outputs[0], LogDefinition) {
+ loggingLevel == 'ERROR'
+ message == 'test'
+ logName == 'yaml'
+ lineNumber == 5
+ }
+ with(context.routeDefinitions[0].outputs[1], ToDefinition) {
+ uri == "direct:result"
+ lineNumber == 8
+ }
+ }
+
+ def "line number route"() {
+ when:
+ loadRoutes '''
+ - route:
+ from:
+ uri: "direct:info"
+ steps:
+ - log: "message"
+ '''
+ then:
+ context.routeDefinitions.size() == 1
+
+ with(context.routeDefinitions[0], RouteDefinition) {
+ input.lineNumber == 3
+ input.endpointUri == 'direct:info'
+
+ with (outputs[0], LogDefinition) {
+ lineNumber == 5
+ message == 'message'
+ }
+ }
+ }
+
+}
[camel] 03/07: CAMEL-17331: include sourceLineNumber in xml dump if possible
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 283ac91f4925457e4d252dd02408d8561d37419d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 14 13:43:05 2021 +0100
CAMEL-17331: include sourceLineNumber in xml dump if possible
---
.../apache/camel/api/management/mbean/ManagedProcessorMBean.java | 3 +++
.../java/org/apache/camel/management/mbean/ManagedProcessor.java | 6 ++++++
.../main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java | 4 ++++
3 files changed, 13 insertions(+)
diff --git a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedProcessorMBean.java b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedProcessorMBean.java
index 037ef98..f5016a0 100644
--- a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedProcessorMBean.java
+++ b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedProcessorMBean.java
@@ -42,6 +42,9 @@ public interface ManagedProcessorMBean extends ManagedPerformanceCounterMBean {
@ManagedAttribute(description = "Processor Index")
Integer getIndex();
+ @ManagedAttribute(description = "Line number of this node in the source file (when loaded from a line number aware parser)")
+ Integer getSourceLineNumber();
+
@ManagedAttribute(description = "Whether this processor supports extended JMX information")
Boolean getSupportExtendedInformation();
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java
index c9efc82..59359b9 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java
@@ -95,6 +95,12 @@ public class ManagedProcessor extends ManagedPerformanceCounter implements Manag
}
@Override
+ public Integer getSourceLineNumber() {
+ int line = definition.getLineNumber();
+ return line >= 0 ? line : null;
+ }
+
+ @Override
public Boolean getSupportExtendedInformation() {
return false;
}
diff --git a/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java b/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java
index 21b650d..ed813cd 100644
--- a/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java
+++ b/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java
@@ -116,6 +116,10 @@ public class JaxbModelToXMLDumper implements ModelToXMLDumper {
String prefix = nsPrefix.equals("xmlns") ? nsPrefix : "xmlns:" + nsPrefix;
documentElement.setAttribute(prefix, entry.getValue());
}
+ // enrich line number
+ if (definition.getLineNumber() >= 0) {
+ documentElement.setAttribute("sourceLineNumber", "" + definition.getLineNumber());
+ }
// We invoke the type converter directly because we need to pass some
// custom XML output options
[camel] 05/07: Fixed NPE in ManagedLog
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8ca47d2a6db29424682c152483caa5aca2228012
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 14 14:09:21 2021 +0100
Fixed NPE in ManagedLog
---
.../src/main/java/org/apache/camel/processor/LogProcessor.java | 4 ++++
.../src/main/java/org/apache/camel/management/mbean/ManagedLog.java | 6 +++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/LogProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/LogProcessor.java
index f56eead3..411794e 100644
--- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/LogProcessor.java
+++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/LogProcessor.java
@@ -139,6 +139,10 @@ public class LogProcessor extends AsyncProcessorSupport implements Traceable, Id
this.routeId = routeId;
}
+ public String getMessage() {
+ return message;
+ }
+
public Expression getExpression() {
return expression;
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedLog.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedLog.java
index 5602d84..bce924c 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedLog.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedLog.java
@@ -35,7 +35,11 @@ public class ManagedLog extends ManagedProcessor implements ManagedLogMBean {
@Override
public String getMessage() {
- return processor.getExpression().toString();
+ if (processor.getExpression() != null) {
+ return processor.getExpression().toString();
+ } else {
+ return processor.getMessage();
+ }
}
@Override
[camel] 01/07: CAMEL-17331: camel-core - Add line number metadata to model
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ab9f776fae34fab764aaafe4e4e21b0a93af64de
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 14 11:49:21 2021 +0100
CAMEL-17331: camel-core - Add line number metadata to model
---
.../camel/{NamedNode.java => LineNumberAware.java} | 33 +++++++---------------
.../src/main/java/org/apache/camel/NamedNode.java | 2 +-
.../camel/model/OptionalIdentifiedDefinition.java | 13 +++++++++
3 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/NamedNode.java b/core/camel-api/src/main/java/org/apache/camel/LineNumberAware.java
similarity index 52%
copy from core/camel-api/src/main/java/org/apache/camel/NamedNode.java
copy to core/camel-api/src/main/java/org/apache/camel/LineNumberAware.java
index 0484e8a..fa9f299 100644
--- a/core/camel-api/src/main/java/org/apache/camel/NamedNode.java
+++ b/core/camel-api/src/main/java/org/apache/camel/LineNumberAware.java
@@ -17,36 +17,23 @@
package org.apache.camel;
/**
- * Represents a node in the {@link org.apache.camel.model routes} which is identified by an id.
+ * An entity that can point to a given line number from a source {@link org.apache.camel.spi.Resource} such as YAML and
+ * XML DSL parsers.
*/
-public interface NamedNode {
+public interface LineNumberAware {
/**
- * Gets the value of the id property.
- */
- String getId();
-
- /**
- * Returns a short name for this node which can be useful for ID generation or referring to related resources like
- * images
+ * The line number of this entity.
*
- * @return defaults to "node" but derived nodes should overload this to provide a unique name
- */
- String getShortName();
-
- /**
- * Returns a label to describe this node such as the expression if some kind of expression node
+ * @return -1 if line number is not possible to know
*/
- String getLabel();
+ int getLineNumber();
/**
- * Returns the description text or null if there is no description text associated with this node
- */
- String getDescriptionText();
-
- /**
- * Returns the parent
+ * Sets the line number of this entity. parsing the source file and provide the line number representing this node.
+ *
+ * @param lineNumber the line number
*/
- NamedNode getParent();
+ void setLineNumber(int lineNumber);
}
diff --git a/core/camel-api/src/main/java/org/apache/camel/NamedNode.java b/core/camel-api/src/main/java/org/apache/camel/NamedNode.java
index 0484e8a..9e40b6b 100644
--- a/core/camel-api/src/main/java/org/apache/camel/NamedNode.java
+++ b/core/camel-api/src/main/java/org/apache/camel/NamedNode.java
@@ -19,7 +19,7 @@ package org.apache.camel;
/**
* Represents a node in the {@link org.apache.camel.model routes} which is identified by an id.
*/
-public interface NamedNode {
+public interface NamedNode extends LineNumberAware {
/**
* Gets the value of the id property.
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
index a680f06..ade87e3 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
@@ -20,6 +20,7 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import org.apache.camel.NamedNode;
@@ -38,6 +39,7 @@ public abstract class OptionalIdentifiedDefinition<T extends OptionalIdentifiedD
private String id;
private Boolean customId;
private DescriptionDefinition description;
+ private transient int lineNumber = -1;
@Override
public String getId() {
@@ -80,6 +82,17 @@ public abstract class OptionalIdentifiedDefinition<T extends OptionalIdentifiedD
return null;
}
+ @Override
+ public int getLineNumber() {
+ return lineNumber;
+ }
+
+ @Override
+ @XmlTransient
+ public void setLineNumber(int lineNumber) {
+ this.lineNumber = lineNumber;
+ }
+
// Fluent API
// -------------------------------------------------------------------------
[camel] 04/07: CAMEL-17331: add line number to model with camel-xml-io
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 97d1566e7fedc1ff4a3768f6e1ddab70c6849fc2
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 14 13:59:14 2021 +0100
CAMEL-17331: add line number to model with camel-xml-io
---
.../src/main/java/org/apache/camel/xml/in/BaseParser.java | 8 ++++----
.../java/org/apache/camel/xml/in/ModelParserTest.java | 15 +++++++++++++++
2 files changed, 19 insertions(+), 4 deletions(-)
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 639c13c..8a03b2c 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
@@ -31,18 +31,15 @@ import java.util.Objects;
import java.util.Set;
import java.util.function.Consumer;
+import org.apache.camel.LineNumberAware;
import org.apache.camel.model.language.ExpressionDefinition;
import org.apache.camel.spi.NamespaceAware;
import org.apache.camel.xml.io.MXParser;
import org.apache.camel.xml.io.XmlPullParser;
import org.apache.camel.xml.io.XmlPullParserException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class BaseParser {
- private static final Logger LOG = LoggerFactory.getLogger(BaseParser.class);
-
protected final MXParser parser;
protected String namespace;
@@ -71,6 +68,9 @@ public class BaseParser {
protected <T> T doParse(
T definition, AttributeHandler<T> attributeHandler, ElementHandler<T> elementHandler, ValueHandler<T> valueHandler)
throws IOException, XmlPullParserException {
+ if (definition instanceof LineNumberAware) {
+ ((LineNumberAware) definition).setLineNumber(parser.getLineNumber());
+ }
if (definition instanceof NamespaceAware) {
final Map<String, String> namespaces = new LinkedHashMap<>();
for (int i = 0; i < parser.getNamespaceCount(parser.getDepth()); i++) {
diff --git a/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ModelParserTest.java b/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ModelParserTest.java
index fa80a30..61a5c26 100644
--- a/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ModelParserTest.java
+++ b/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ModelParserTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.xml.in;
import java.io.File;
+import java.io.FileInputStream;
import java.io.StringReader;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -32,6 +33,7 @@ import org.apache.camel.model.RoutesDefinition;
import org.apache.camel.model.SetBodyDefinition;
import org.apache.camel.model.language.XPathExpression;
import org.apache.camel.model.rest.RestsDefinition;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -116,6 +118,19 @@ public class ModelParserTest {
assertEquals("http://camel.apache.org/foo", namespaces.get("foo"));
}
+ @Test
+ public void testLineNumber() throws Exception {
+ Path dir = getResourceFolder();
+ File file = new File(dir.toFile(), "setHeader.xml");
+ ModelParser parser = new ModelParser(new FileInputStream(file), NAMESPACE);
+ RoutesDefinition routes = parser.parseRoutesDefinition().orElse(null);
+ assertNotNull(routes);
+ RouteDefinition route = routes.getRoutes().get(0);
+ Assertions.assertEquals(22, route.getInput().getLineNumber());
+ Assertions.assertEquals(23, route.getOutputs().get(0).getLineNumber());
+ Assertions.assertEquals(26, route.getOutputs().get(1).getLineNumber());
+ }
+
private Path getResourceFolder() {
String url = getClass().getClassLoader().getResource("barInterceptorRoute.xml").toString();
if (url.startsWith("file:")) {
[camel] 06/07: CAMEL-17331: include source location and line number to processor mbeans
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit cf1412f1761edd84152a43c79971665649483699
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 14 14:19:58 2021 +0100
CAMEL-17331: include source location and line number to processor mbeans
---
.../camel/api/management/mbean/ManagedProcessorMBean.java | 3 +++
.../org/apache/camel/management/mbean/ManagedProcessor.java | 11 +++++++++++
2 files changed, 14 insertions(+)
diff --git a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedProcessorMBean.java b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedProcessorMBean.java
index f5016a0..c8d9155 100644
--- a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedProcessorMBean.java
+++ b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedProcessorMBean.java
@@ -42,6 +42,9 @@ public interface ManagedProcessorMBean extends ManagedPerformanceCounterMBean {
@ManagedAttribute(description = "Processor Index")
Integer getIndex();
+ @ManagedAttribute(description = "Source file Location")
+ String getSourceLocation();
+
@ManagedAttribute(description = "Line number of this node in the source file (when loaded from a line number aware parser)")
Integer getSourceLineNumber();
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java
index 59359b9..1acfe0d 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java
@@ -27,6 +27,7 @@ import org.apache.camel.api.management.ManagedResource;
import org.apache.camel.api.management.mbean.ManagedProcessorMBean;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.ProcessorDefinitionHelper;
+import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.StepDefinition;
import org.apache.camel.spi.ManagementStrategy;
import org.apache.camel.spi.RouteIdAware;
@@ -41,6 +42,7 @@ public class ManagedProcessor extends ManagedPerformanceCounter implements Manag
private final String id;
private String stepId;
private Route route;
+ private String sourceLocation;
public ManagedProcessor(CamelContext context, Processor processor, ProcessorDefinition<?> definition) {
this.context = context;
@@ -54,6 +56,10 @@ public class ManagedProcessor extends ManagedPerformanceCounter implements Manag
step = ProcessorDefinitionHelper.findFirstParentOfType(StepDefinition.class, definition, true);
}
this.stepId = step != null ? step.idOrCreate(context.adapt(ExtendedCamelContext.class).getNodeIdFactory()) : null;
+ RouteDefinition rd = ProcessorDefinitionHelper.getRoute(definition);
+ if (rd != null && rd.getResource() != null) {
+ this.sourceLocation = rd.getResource().getLocation();
+ }
}
@Override
@@ -95,6 +101,11 @@ public class ManagedProcessor extends ManagedPerformanceCounter implements Manag
}
@Override
+ public String getSourceLocation() {
+ return sourceLocation;
+ }
+
+ @Override
public Integer getSourceLineNumber() {
int line = definition.getLineNumber();
return line >= 0 ? line : null;
[camel] 07/07: CAMEL-17331: include sourceLineNumber in xml dump if possible. Remove as we need a better way.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 355f01bf1191f8007ba2dbd3710114717b855a81
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 14 14:24:37 2021 +0100
CAMEL-17331: include sourceLineNumber in xml dump if possible. Remove as we need a better way.
---
.../src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java | 4 ----
1 file changed, 4 deletions(-)
diff --git a/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java b/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java
index ed813cd..21b650d 100644
--- a/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java
+++ b/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java
@@ -116,10 +116,6 @@ public class JaxbModelToXMLDumper implements ModelToXMLDumper {
String prefix = nsPrefix.equals("xmlns") ? nsPrefix : "xmlns:" + nsPrefix;
documentElement.setAttribute(prefix, entry.getValue());
}
- // enrich line number
- if (definition.getLineNumber() >= 0) {
- documentElement.setAttribute("sourceLineNumber", "" + definition.getLineNumber());
- }
// We invoke the type converter directly because we need to pass some
// custom XML output options