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 2023/08/08 18:57:54 UTC
[camel] branch main updated: (chores) Adjusted leftover components to use log markers (#11049)
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
The following commit(s) were added to refs/heads/main by this push:
new 31640d030e9 (chores) Adjusted leftover components to use log markers (#11049)
31640d030e9 is described below
commit 31640d030e90c7bcf5c4a15fdd3ce39d88062d42
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Tue Aug 8 20:57:48 2023 +0200
(chores) Adjusted leftover components to use log markers (#11049)
---
.../bindy/fix/BindyComplexKeyValuePairStandaloneTest.java | 2 +-
.../java/org/apache/camel/component/box/BoxFoldersManagerIT.java | 2 +-
.../src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java | 4 ++--
.../org/apache/camel/component/cxf/jaxws/CxfProducerRouterTest.java | 2 +-
.../java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java | 4 ++--
.../org/apache/camel/component/cxf/util/SplitterWithXqureyTest.java | 2 +-
.../src/test/java/org/apache/camel/non_wrapper/PersonProcessor.java | 2 +-
.../src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java | 2 +-
.../test/java/org/apache/camel/component/cxf/HelloServiceImpl.java | 2 +-
.../camel/component/cxf/spring/FileToCxfMessageDataFormatTest.java | 2 +-
.../src/test/java/org/apache/camel/non_wrapper/PersonProcessor.java | 2 +-
.../src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java | 2 +-
.../org/apache/camel/component/irc/CodehausIrcChatManualTest.java | 2 +-
.../test/java/org/apache/camel/component/jetty/HttpRouteTest.java | 4 ++--
.../camel/component/lucene/LuceneIndexAndQueryProducerIT.java | 6 +++---
.../org/apache/camel/processor/lucene/LuceneQueryProcessorIT.java | 4 ++--
.../apache/camel/component/resilience4j/ResilienceTimeoutTest.java | 2 +-
.../component/resilience4j/ResilienceTimeoutThreadPoolTest.java | 2 +-
.../test/java/org/apache/camel/component/bean/BeanRouteTest.java | 2 +-
19 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java
index 19ee3a89500..4d07f4bce03 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java
@@ -102,7 +102,7 @@ public class BindyComplexKeyValuePairStandaloneTest {
CamelContext camelContext = new DefaultCamelContext();
factory.bind(camelContext, data, model, counter);
- LOG.info(">>> Model : " + model.toString());
+ LOG.info(">>> Model : {}", model.toString());
assertNotNull(model);
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIT.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIT.java
index 6576295574e..19f4f411c31 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIT.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIT.java
@@ -114,7 +114,7 @@ public class BoxFoldersManagerIT extends AbstractBoxITSupport {
result = requestBodyAndHeaders("direct://COPYFOLDER", null, headers);
assertNotNull(result, "copyFolder result");
assertEquals(CAMEL_TEST_COPY_FOLDER, result.getInfo().getName(), "copyFolder folder name");
- LOG.debug("copyFolder: " + result);
+ LOG.debug("copyFolder: {}", result);
} finally {
if (result != null) {
try {
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java
index 2d38b4d1bf7..54f8e687fbb 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java
@@ -86,7 +86,7 @@ public class CsvRouteTest extends CamelTestSupport {
Message in1 = list.get(0).getIn();
String text1 = in1.getBody(String.class);
- LOG.debug("Received " + text1);
+ LOG.debug("Received {}", text1);
assertTrue(Pattern.matches("(abc,123)|(123,abc)", text1.trim()), "First CSV body has wrong value");
Message in2 = list.get(1).getIn();
@@ -124,7 +124,7 @@ public class CsvRouteTest extends CamelTestSupport {
Message in1 = list.get(0).getIn();
String text1 = in1.getBody(String.class);
- LOG.debug("Received " + text1);
+ LOG.debug("Received {}", text1);
assertEquals("abc;;123", text1.trim(), "First CSV body has wrong value");
Message in2 = list.get(1).getIn();
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerRouterTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerRouterTest.java
index 811fe1a8dcc..544b4c348ca 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerRouterTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerRouterTest.java
@@ -130,7 +130,7 @@ public class CxfProducerRouterTest extends CamelTestSupport {
// If there are some holder parameters, the holder parameter will be filled in the reset of List.
// The result will be extract from the MessageContentsList with the String class type
MessageContentsList result = (MessageContentsList) out.getBody();
- LOG.info("Received output text: " + result.get(0));
+ LOG.info("Received output text: {}", result.get(0));
Map<String, Object> responseContext = CastUtils.cast((Map<?, ?>) out.getHeader(Client.RESPONSE_CONTEXT));
assertNotNull(responseContext);
assertEquals("UTF-8", responseContext.get(org.apache.cxf.message.Message.ENCODING),
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java
index 595264d9d9d..33af8e8dbfd 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java
@@ -116,7 +116,7 @@ public class CxfProducerTest {
org.apache.camel.Message out = exchange.getMessage();
String result = out.getBody(String.class);
- LOG.info("Received output text: " + result);
+ LOG.info("Received output text: {}", result);
Map<String, Object> responseContext = CastUtils.cast((Map<?, ?>) out.getHeader(Client.RESPONSE_CONTEXT));
assertNotNull(responseContext);
assertEquals("UTF-8", responseContext.get(org.apache.cxf.message.Message.ENCODING),
@@ -155,7 +155,7 @@ public class CxfProducerTest {
org.apache.camel.Message out = exchange.getMessage();
String result = out.getBody(String.class);
- LOG.info("Received output text: " + result);
+ LOG.info("Received output text: {}", result);
Map<String, Object> responseContext = CastUtils.cast((Map<?, ?>) out.getHeader(Client.RESPONSE_CONTEXT));
assertNotNull(responseContext);
assertEquals("{http://apache.org/hello_world_soap_http}greetMe",
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/util/SplitterWithXqureyTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/util/SplitterWithXqureyTest.java
index 3a05b242de5..2d89c74807f 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/util/SplitterWithXqureyTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/util/SplitterWithXqureyTest.java
@@ -80,7 +80,7 @@ public class SplitterWithXqureyTest extends CamelTestSupport {
for (Exchange exchange : result.getExchanges()) {
Element element = (Element) exchange.getIn().getBody();
String message = CxfUtilsTestHelper.elementToString(element);
- LOG.info("The splited message is " + message);
+ LOG.info("The splited message is {}", message);
assertEquals(0, message.indexOf("<other"), "The splitted message should start with <other");
assertEquals(verifyStrings[i], message, "Get a wrong message");
i++;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/non_wrapper/PersonProcessor.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/non_wrapper/PersonProcessor.java
index 9275a318fc5..0baee7db6c3 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/non_wrapper/PersonProcessor.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/non_wrapper/PersonProcessor.java
@@ -35,7 +35,7 @@ public class PersonProcessor implements Processor {
BindingOperationInfo boi = (BindingOperationInfo) exchange.getProperty(BindingOperationInfo.class.getName());
if (boi != null) {
- LOG.info("boi.isUnwrapped" + boi.isUnwrapped());
+ LOG.info("boi.isUnwrapped {}", boi.isUnwrapped());
}
GetPerson person = exchange.getIn().getBody(GetPerson.class);
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java
index 5783c627ab2..a08b350f5c8 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java
@@ -37,7 +37,7 @@ public class PersonProcessor implements Processor {
BindingOperationInfo boi = (BindingOperationInfo) exchange.getProperty(BindingOperationInfo.class.getName());
if (boi != null) {
- LOG.info("boi.isUnwrapped" + boi.isUnwrapped());
+ LOG.info("boi.isUnwrapped {}", boi.isUnwrapped());
}
// Get the parameters list which element is the holder.
MessageContentsList msgList = (MessageContentsList) exchange.getIn().getBody();
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/HelloServiceImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/HelloServiceImpl.java
index 5b19f8e152d..a2fec4240c3 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/HelloServiceImpl.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/HelloServiceImpl.java
@@ -37,7 +37,7 @@ public class HelloServiceImpl implements HelloService {
@Override
public String echo(String text) {
- LOG.info("call for echo with " + text);
+ LOG.info("call for echo with {}", text);
return "echo " + text;
}
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/spring/FileToCxfMessageDataFormatTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/spring/FileToCxfMessageDataFormatTest.java
index 058279eb2e5..313a5a1f6c7 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/spring/FileToCxfMessageDataFormatTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/spring/FileToCxfMessageDataFormatTest.java
@@ -85,7 +85,7 @@ public class FileToCxfMessageDataFormatTest extends CamelSpringTestSupport {
String out = mock.getReceivedExchanges().get(0).getIn().getBody(String.class);
assertNotNull(out);
- LOG.info("Reply payload as a String:\n" + out);
+ LOG.info("Reply payload as a String:\n{}", out);
assertTrue(out.contains("echo Camel"), "Should invoke the echo operation");
}
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/non_wrapper/PersonProcessor.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/non_wrapper/PersonProcessor.java
index 9275a318fc5..0baee7db6c3 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/non_wrapper/PersonProcessor.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/non_wrapper/PersonProcessor.java
@@ -35,7 +35,7 @@ public class PersonProcessor implements Processor {
BindingOperationInfo boi = (BindingOperationInfo) exchange.getProperty(BindingOperationInfo.class.getName());
if (boi != null) {
- LOG.info("boi.isUnwrapped" + boi.isUnwrapped());
+ LOG.info("boi.isUnwrapped {}", boi.isUnwrapped());
}
GetPerson person = exchange.getIn().getBody(GetPerson.class);
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java
index 5783c627ab2..a08b350f5c8 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java
@@ -37,7 +37,7 @@ public class PersonProcessor implements Processor {
BindingOperationInfo boi = (BindingOperationInfo) exchange.getProperty(BindingOperationInfo.class.getName());
if (boi != null) {
- LOG.info("boi.isUnwrapped" + boi.isUnwrapped());
+ LOG.info("boi.isUnwrapped {}", boi.isUnwrapped());
}
// Get the parameters list which element is the holder.
MessageContentsList msgList = (MessageContentsList) exchange.getIn().getBody();
diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/CodehausIrcChatManualTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/CodehausIrcChatManualTest.java
index c6be0d6662f..40d42c9da32 100644
--- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/CodehausIrcChatManualTest.java
+++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/CodehausIrcChatManualTest.java
@@ -72,7 +72,7 @@ public final class CodehausIrcChatManualTest {
@Override
public void onError(int i, String string) {
super.onError(i, string);
- LOG.info("onError.i = " + i);
+ LOG.info("onError.i = {}", i);
LOG.info("onError.string = {}", string);
}
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java
index 603220eedc3..3985076c353 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java
@@ -217,8 +217,8 @@ public class HttpRouteTest extends BaseJettyTest {
public void process(Exchange exchange) {
Message out = exchange.getMessage();
out.copyFrom(exchange.getIn());
- log.info("The body's object is " + exchange.getIn().getBody());
- log.info("Process body = " + exchange.getIn().getBody(String.class));
+ log.info("The body's object is {}", exchange.getIn().getBody());
+ log.info("Process body = {}", exchange.getIn().getBody(String.class));
InputStreamCache cache = out.getBody(InputStreamCache.class);
cache.reset();
}
diff --git a/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerIT.java b/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerIT.java
index ed3cda1979c..0ebf8775487 100644
--- a/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerIT.java
+++ b/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerIT.java
@@ -168,7 +168,7 @@ public class LuceneIndexAndQueryProducerIT extends CamelTestSupport {
}
private void printResults(Hits hits) {
- LOG.debug("Number of hits: " + hits.getNumberOfHits());
+ LOG.debug("Number of hits: {}", hits.getNumberOfHits());
for (int i = 0; i < hits.getNumberOfHits(); i++) {
LOG.debug("Hit {} Index Location: {}", i, hits.getHit().get(i).getHitLocation());
LOG.debug("Hit {} Score: {}", i, hits.getHit().get(i).getScore());
@@ -203,7 +203,7 @@ public class LuceneIndexAndQueryProducerIT extends CamelTestSupport {
}
private void printResults(Hits hits) throws Exception {
- LOG.debug("Number of hits: " + hits.getNumberOfHits());
+ LOG.debug("Number of hits: {}", hits.getNumberOfHits());
for (int i = 0; i < hits.getNumberOfHits(); i++) {
LOG.debug("Hit {} Index Location: {}", i, hits.getHit().get(i).getHitLocation());
LOG.debug("Hit {} Score: {}", i, hits.getHit().get(i).getScore());
@@ -220,7 +220,7 @@ public class LuceneIndexAndQueryProducerIT extends CamelTestSupport {
map.put("NO_LUCENE_DOCS_ERROR", "NO LUCENE DOCS FOUND");
exchange.getContext().setGlobalOptions(map);
}
- LOG.debug("Number of hits: " + hits.getNumberOfHits());
+ LOG.debug("Number of hits: {}", hits.getNumberOfHits());
});
}
});
diff --git a/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorIT.java b/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorIT.java
index bd76087fa00..d8a05bfa3a6 100644
--- a/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorIT.java
+++ b/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorIT.java
@@ -73,7 +73,7 @@ public class LuceneQueryProcessorIT extends CamelTestSupport {
}
private void printResults(Hits hits) {
- LOG.debug("Number of hits: " + hits.getNumberOfHits());
+ LOG.debug("Number of hits: {}", hits.getNumberOfHits());
for (int i = 0; i < hits.getNumberOfHits(); i++) {
LOG.debug("Hit {} Index Location: {}", i, hits.getHit().get(i).getHitLocation());
LOG.debug("Hit {} Score: {}", i, hits.getHit().get(i).getScore());
@@ -116,7 +116,7 @@ public class LuceneQueryProcessorIT extends CamelTestSupport {
}
private void printResults(Hits hits) {
- LOG.debug("Number of hits: " + hits.getNumberOfHits());
+ LOG.debug("Number of hits: {}", hits.getNumberOfHits());
for (int i = 0; i < hits.getNumberOfHits(); i++) {
LOG.debug("Hit {} Index Location: {}", i, hits.getHit().get(i).getHitLocation());
LOG.debug("Hit {} Score: {}", i, hits.getHit().get(i).getScore());
diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutTest.java
index e9742634940..9d02eb18f88 100644
--- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutTest.java
+++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutTest.java
@@ -60,7 +60,7 @@ public class ResilienceTimeoutTest extends CamelTestSupport {
// this calls the slow route and therefore causes a timeout which
// triggers an exception
for (int i = 0; i < 10; i++) {
- log.info(">>> test run " + i + " <<<");
+ log.info(">>> test run {} <<<", i);
Exception exception = assertThrows(Exception.class,
() -> template.requestBody("direct:start", "slow"),
"Should fail due to timeout");
diff --git a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutThreadPoolTest.java b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutThreadPoolTest.java
index 781ab8acf69..77bfd4f7a42 100644
--- a/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutThreadPoolTest.java
+++ b/components/camel-resilience4j/src/test/java/org/apache/camel/component/resilience4j/ResilienceTimeoutThreadPoolTest.java
@@ -89,7 +89,7 @@ public class ResilienceTimeoutThreadPoolTest extends CamelTestSupport {
// this calls the slow route and therefore causes a timeout which
// triggers an exception
for (int i = 0; i < 10; i++) {
- log.info(">>> test run " + i + " <<<");
+ log.info(">>> test run {} <<<", i);
Exception exception = assertThrows(Exception.class,
() -> template.requestBody("direct:start", "slow"),
"Should fail due to timeout");
diff --git a/components/camel-spring-xml/src/test/java/org/apache/camel/component/bean/BeanRouteTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/bean/BeanRouteTest.java
index 809d3a98634..26f380c7eb8 100644
--- a/components/camel-spring-xml/src/test/java/org/apache/camel/component/bean/BeanRouteTest.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/component/bean/BeanRouteTest.java
@@ -54,7 +54,7 @@ public class BeanRouteTest extends SpringTestSupport {
Object value = template.requestBody("bean:myBean", body);
fail("We should have failed to invoke an ambiguous method but instead got: " + value);
} catch (Exception e) {
- log.info("Caught expected failure: " + e, e);
+ log.info("Caught expected failure: {}", e.getMessage(), e);
}
}