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
The following commit(s) were added to refs/heads/main by this push:
new 13589295494 camel-core - Source location should preserve scheme in
Java DSL
13589295494 is described below
commit 135892954947ca21d2e349e5181055ae166eed6a
Author: Claus Ibsen <[email protected]>
AuthorDate: Sat Sep 17 09:52:44 2022 +0200
camel-core - Source location should preserve scheme in Java DSL
---
.../src/main/java/org/apache/camel/LineNumberAware.java | 2 +-
.../camel/processor/LineNumberProcessorDebuggingTest.java | 2 +-
.../org/apache/camel/processor/LineNumberProcessorTest.java | 2 +-
.../camel/processor/LineNumberProcessorTracingTest.java | 2 +-
.../apache/camel/util/DumpModelAsXmlSourceLocationTest.java | 6 +++---
.../org/apache/camel/management/ManagedCamelContextTest.java | 12 ++++++------
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/LineNumberAware.java
b/core/camel-api/src/main/java/org/apache/camel/LineNumberAware.java
index 100f6870a56..bc3631241e9 100644
--- a/core/camel-api/src/main/java/org/apache/camel/LineNumberAware.java
+++ b/core/camel-api/src/main/java/org/apache/camel/LineNumberAware.java
@@ -42,7 +42,7 @@ public interface LineNumberAware {
String getLocation();
/**
- * Sets the location of the entity (such as classname, XML file name, etc.)
+ * Sets the location of the entity (source file name, i.e. foo.java,
bar.xml, etc.)
*/
void setLocation(String location);
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/LineNumberProcessorDebuggingTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/LineNumberProcessorDebuggingTest.java
index 53dc719c7c8..afacec300f1 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/LineNumberProcessorDebuggingTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/LineNumberProcessorDebuggingTest.java
@@ -46,7 +46,7 @@ public class LineNumberProcessorDebuggingTest {
ProducerTemplate template = context.createProducerTemplate();
Object out = template.requestBody("direct:start", "Hello World");
-
Assertions.assertEquals("org.apache.camel.processor.LineNumberProcessorDebuggingTest$1:40",
out);
+ Assertions.assertEquals("LineNumberProcessorDebuggingTest.java:40",
out);
}
private static class MyProcessor implements Processor, LineNumberAware {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/LineNumberProcessorTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/LineNumberProcessorTest.java
index 268ddc5d855..460c4e4276d 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/LineNumberProcessorTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/LineNumberProcessorTest.java
@@ -35,7 +35,7 @@ public class LineNumberProcessorTest extends
ContextTestSupport {
@Test
public void testLineNumber() throws Exception {
-
getMockEndpoint("mock:result").expectedBodiesReceived("org.apache.camel.processor.LineNumberProcessorTest$1:51");
+
getMockEndpoint("mock:result").expectedBodiesReceived("LineNumberProcessorTest.java:51");
template.sendBody("direct:start", "Hello World");
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/LineNumberProcessorTracingTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/LineNumberProcessorTracingTest.java
index a3422eacfa9..227c30dfa98 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/LineNumberProcessorTracingTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/LineNumberProcessorTracingTest.java
@@ -47,7 +47,7 @@ public class LineNumberProcessorTracingTest extends
ContextTestSupport {
ProducerTemplate template = context.createProducerTemplate();
Object out = template.requestBody("direct:start", "Hello World");
-
Assertions.assertEquals("org.apache.camel.processor.LineNumberProcessorTracingTest$1:41",
out);
+ Assertions.assertEquals("LineNumberProcessorTracingTest.java:41", out);
}
private static class MyProcessor implements Processor, LineNumberAware {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSourceLocationTest.java
b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSourceLocationTest.java
index af318551ae2..3021d011485 100644
---
a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSourceLocationTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSourceLocationTest.java
@@ -42,7 +42,7 @@ public class DumpModelAsXmlSourceLocationTest extends
ContextTestSupport {
log.info(xml);
Assertions.assertTrue(xml.contains(
- "sourceLineNumber=\"66\"
sourceLocation=\"org.apache.camel.util.DumpModelAsXmlSourceLocationTest$1\""));
+ "sourceLineNumber=\"66\"
sourceLocation=\"DumpModelAsXmlSourceLocationTest.java\""));
}
@Test
@@ -53,8 +53,8 @@ public class DumpModelAsXmlSourceLocationTest extends
ContextTestSupport {
log.info(xml);
Assertions.assertTrue(xml.contains(
- "<from sourceLineNumber=\"25\"
sourceLocation=\"org.apache.camel.util.MyCoolRoute\" uri=\"direct:cool\"/>"));
- Assertions.assertTrue(xml.contains("sourceLineNumber=\"26\"
sourceLocation=\"org.apache.camel.util.MyCoolRoute\""));
+ "<from sourceLineNumber=\"25\"
sourceLocation=\"MyCoolRoute.java\" uri=\"direct:cool\"/>"));
+ Assertions.assertTrue(xml.contains("sourceLineNumber=\"26\"
sourceLocation=\"MyCoolRoute.java\""));
}
@Override
diff --git
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
index cedc534cf55..df4d7fdd69b 100644
---
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
+++
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
@@ -267,18 +267,18 @@ public class ManagedCamelContextTest extends
ManagementTestSupport {
Assertions.assertNotNull(xml);
Assertions.assertTrue(xml.contains(
-
"sourceLocation=\"org.apache.camel.management.ManagedCamelContextTest$1\"
sourceLineNumber=\"289\"/>"));
+ "sourceLocation=\"ManagedCamelContextTest.java\"
sourceLineNumber=\"289\"/>"));
Assertions.assertTrue(xml.contains(
-
"sourceLocation=\"org.apache.camel.management.ManagedCamelContextTest$1\"
sourceLineNumber=\"290\"/>"));
+ "sourceLocation=\"ManagedCamelContextTest.java\"
sourceLineNumber=\"290\"/>"));
Assertions.assertTrue(xml.contains(
-
"sourceLocation=\"org.apache.camel.management.ManagedCamelContextTest$1\"
sourceLineNumber=\"291\"/>"));
+ "sourceLocation=\"ManagedCamelContextTest.java\"
sourceLineNumber=\"291\"/>"));
Assertions.assertTrue(xml.contains(
-
"sourceLocation=\"org.apache.camel.management.ManagedCamelContextTest$1\"
sourceLineNumber=\"293\"/>"));
+ "sourceLocation=\"ManagedCamelContextTest.java\"
sourceLineNumber=\"293\"/>"));
Assertions.assertTrue(xml.contains(
-
"sourceLocation=\"org.apache.camel.management.ManagedCamelContextTest$1\"
sourceLineNumber=\"294\"/>"));
+ "sourceLocation=\"ManagedCamelContextTest.java\"
sourceLineNumber=\"294\"/>"));
Assertions.assertTrue(xml.contains(
-
"sourceLocation=\"org.apache.camel.management.ManagedCamelContextTest$1\"
sourceLineNumber=\"295\"/>"));
+ "sourceLocation=\"ManagedCamelContextTest.java\"
sourceLineNumber=\"295\"/>"));
}
@Override
