You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2022/05/07 16:18:09 UTC
[camel] branch cleanup created (now e17b7743a03)
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a change to branch cleanup
in repository https://gitbox.apache.org/repos/asf/camel.git
at e17b7743a03 cleanup camel-tracing codebase a bit
This branch includes the following new commits:
new e17b7743a03 cleanup camel-tracing codebase a bit
The 1 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.
[camel] 01/01: cleanup camel-tracing codebase a bit
Posted by bv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch cleanup
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e17b7743a03f4591344a808afe05740081b06ddd
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Sat May 7 18:17:17 2022 +0200
cleanup camel-tracing codebase a bit
---
.../camel/tracing/decorators/IronmqSpanDecorator.java | 2 +-
.../apache/camel/tracing/decorators/JmsSpanDecorator.java | 2 +-
.../apache/camel/tracing/decorators/NsqSpanDecorator.java | 2 +-
.../apache/camel/tracing/decorators/SqlSpanDecorator.java | 6 +++---
.../tracing/decorators/AbstractHttpSpanDecoratorTest.java | 13 +++++++------
.../camel/tracing/decorators/IronmqSpanDecoratorTest.java | 2 +-
.../camel/tracing/decorators/JmsSpanDecoratorTest.java | 2 +-
.../camel/tracing/decorators/SqlSpanDecoratorTest.java | 2 +-
8 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/IronmqSpanDecorator.java b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/IronmqSpanDecorator.java
index 3b5b2612228..1c4f73e175e 100644
--- a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/IronmqSpanDecorator.java
+++ b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/IronmqSpanDecorator.java
@@ -34,7 +34,7 @@ public class IronmqSpanDecorator extends AbstractMessagingSpanDecorator {
@Override
protected String getMessageId(Exchange exchange) {
- return (String) exchange.getIn().getHeader(CAMEL_IRON_MQ_MESSAGE_ID);
+ return exchange.getIn().getHeader(CAMEL_IRON_MQ_MESSAGE_ID, String.class);
}
}
diff --git a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JmsSpanDecorator.java b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JmsSpanDecorator.java
index 6d7c8dca32c..ba3d48073cb 100644
--- a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JmsSpanDecorator.java
+++ b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JmsSpanDecorator.java
@@ -45,7 +45,7 @@ public class JmsSpanDecorator extends AbstractMessagingSpanDecorator {
@Override
protected String getMessageId(Exchange exchange) {
- return (String) exchange.getIn().getHeader(JMS_MESSAGE_ID);
+ return exchange.getIn().getHeader(JMS_MESSAGE_ID, String.class);
}
}
diff --git a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/NsqSpanDecorator.java b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/NsqSpanDecorator.java
index 6b1fc5b460f..ba1a68b2f65 100644
--- a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/NsqSpanDecorator.java
+++ b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/NsqSpanDecorator.java
@@ -38,7 +38,7 @@ public class NsqSpanDecorator extends AbstractMessagingSpanDecorator {
@Override
public String getDestination(Exchange exchange, Endpoint endpoint) {
- String topic = (String) exchange.getIn().getHeader(NSQ_TOPIC);
+ String topic = exchange.getIn().getHeader(NSQ_TOPIC, String.class);
if (topic == null) {
Map<String, String> queryParameters = toQueryParameters(endpoint.getEndpointUri());
topic = queryParameters.get("topic");
diff --git a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/SqlSpanDecorator.java b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/SqlSpanDecorator.java
index c21be7ee9ae..f25517e0e82 100644
--- a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/SqlSpanDecorator.java
+++ b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/SqlSpanDecorator.java
@@ -40,9 +40,9 @@ public class SqlSpanDecorator extends AbstractSpanDecorator {
super.pre(span, exchange, endpoint);
span.setTag(Tag.DB_TYPE, "sql");
- Object sqlquery = exchange.getIn().getHeader(CAMEL_SQL_QUERY);
- if (sqlquery instanceof String) {
- span.setTag(Tag.DB_STATEMENT, (String) sqlquery);
+ String sqlquery = exchange.getIn().getHeader(CAMEL_SQL_QUERY, String.class);
+ if (sqlquery != null) {
+ span.setTag(Tag.DB_STATEMENT, sqlquery);
}
}
diff --git a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/AbstractHttpSpanDecoratorTest.java b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/AbstractHttpSpanDecoratorTest.java
index 3cacc99c65f..0818c5ecaef 100644
--- a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/AbstractHttpSpanDecoratorTest.java
+++ b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/AbstractHttpSpanDecoratorTest.java
@@ -97,7 +97,8 @@ public class AbstractHttpSpanDecoratorTest {
Mockito.when(endpoint.getEndpointUri()).thenReturn("http://localhost:8080/endpoint?query=hello");
Mockito.when(exchange.getIn()).thenReturn(message);
- Mockito.when(message.getHeader(Exchange.HTTP_URI)).thenReturn("http://localhost:8080/endpoint?query=hello");
+ Mockito.when(message.getHeader(Exchange.HTTP_URI, String.class))
+ .thenReturn("http://localhost:8080/endpoint?query=hello");
assertEquals(AbstractHttpSpanDecorator.GET_METHOD,
AbstractHttpSpanDecorator.getHttpMethod(exchange, endpoint));
@@ -111,7 +112,7 @@ public class AbstractHttpSpanDecoratorTest {
Mockito.when(endpoint.getEndpointUri()).thenReturn(TEST_URI);
Mockito.when(exchange.getIn()).thenReturn(message);
- Mockito.when(message.getHeader(Exchange.HTTP_URI)).thenReturn(TEST_URI);
+ Mockito.when(message.getHeader(Exchange.HTTP_URI, String.class)).thenReturn(TEST_URI);
Mockito.when(message.getBody()).thenReturn("Message Body");
assertEquals(AbstractHttpSpanDecorator.POST_METHOD,
@@ -140,7 +141,7 @@ public class AbstractHttpSpanDecoratorTest {
Mockito.when(endpoint.getEndpointUri()).thenReturn(TEST_URI);
Mockito.when(exchange.getIn()).thenReturn(message);
- Mockito.when(message.getHeader(Exchange.HTTP_URI)).thenReturn(TEST_URI);
+ Mockito.when(message.getHeader(Exchange.HTTP_URI, String.class)).thenReturn(TEST_URI);
SpanDecorator decorator = new AbstractHttpSpanDecorator() {
@Override
@@ -170,8 +171,8 @@ public class AbstractHttpSpanDecoratorTest {
Mockito.when(endpoint.getEndpointUri()).thenReturn(TEST_URI);
Mockito.when(exchange.getIn()).thenReturn(message);
- Mockito.when(message.getHeader(Exchange.HTTP_URI)).thenReturn("Another URL");
- Mockito.when(message.getHeader(Exchange.HTTP_URL)).thenReturn(TEST_URI);
+ Mockito.when(message.getHeader(Exchange.HTTP_URI, String.class)).thenReturn("Another URL");
+ Mockito.when(message.getHeader(Exchange.HTTP_URL, String.class)).thenReturn(TEST_URI);
AbstractHttpSpanDecorator decorator = new AbstractHttpSpanDecorator() {
@Override
@@ -196,7 +197,7 @@ public class AbstractHttpSpanDecoratorTest {
Mockito.when(endpoint.getEndpointUri()).thenReturn(TEST_URI);
Mockito.when(exchange.getIn()).thenReturn(message);
- Mockito.when(message.getHeader(Exchange.HTTP_URI)).thenReturn(TEST_URI);
+ Mockito.when(message.getHeader(Exchange.HTTP_URI, String.class)).thenReturn(TEST_URI);
AbstractHttpSpanDecorator decorator = new AbstractHttpSpanDecorator() {
@Override
diff --git a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/IronmqSpanDecoratorTest.java b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/IronmqSpanDecoratorTest.java
index 72000ac8c4b..ecc3e2666c6 100644
--- a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/IronmqSpanDecoratorTest.java
+++ b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/IronmqSpanDecoratorTest.java
@@ -32,7 +32,7 @@ public class IronmqSpanDecoratorTest {
Message message = Mockito.mock(Message.class);
Mockito.when(exchange.getIn()).thenReturn(message);
- Mockito.when(message.getHeader(IronmqSpanDecorator.CAMEL_IRON_MQ_MESSAGE_ID)).thenReturn(messageId);
+ Mockito.when(message.getHeader(IronmqSpanDecorator.CAMEL_IRON_MQ_MESSAGE_ID, String.class)).thenReturn(messageId);
IronmqSpanDecorator decorator = new IronmqSpanDecorator();
diff --git a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/JmsSpanDecoratorTest.java b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/JmsSpanDecoratorTest.java
index 32ab30dcf7d..166f0beea39 100644
--- a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/JmsSpanDecoratorTest.java
+++ b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/JmsSpanDecoratorTest.java
@@ -33,7 +33,7 @@ public class JmsSpanDecoratorTest {
Message message = Mockito.mock(Message.class);
Mockito.when(exchange.getIn()).thenReturn(message);
- Mockito.when(message.getHeader(JmsSpanDecorator.JMS_MESSAGE_ID)).thenReturn(messageId);
+ Mockito.when(message.getHeader(JmsSpanDecorator.JMS_MESSAGE_ID, String.class)).thenReturn(messageId);
JmsSpanDecorator decorator = new JmsSpanDecorator();
diff --git a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/SqlSpanDecoratorTest.java b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/SqlSpanDecoratorTest.java
index 697a8effb9b..6e38917c188 100644
--- a/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/SqlSpanDecoratorTest.java
+++ b/components/camel-tracing/src/test/java/org/apache/camel/tracing/decorators/SqlSpanDecoratorTest.java
@@ -39,7 +39,7 @@ public class SqlSpanDecoratorTest {
Mockito.when(endpoint.getEndpointUri()).thenReturn("test");
Mockito.when(exchange.getIn()).thenReturn(message);
- Mockito.when(message.getHeader(SqlSpanDecorator.CAMEL_SQL_QUERY)).thenReturn(SQL_STATEMENT);
+ Mockito.when(message.getHeader(SqlSpanDecorator.CAMEL_SQL_QUERY, String.class)).thenReturn(SQL_STATEMENT);
SpanDecorator decorator = new SqlSpanDecorator();