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-spring-boot.git
The following commit(s) were added to refs/heads/main by this push: new 98c4e5d351e (chores) Use log markers for log messages (#905) 98c4e5d351e is described below commit 98c4e5d351e106421a8d5c601d32c4bbfc5f6fcf Author: Otavio Rodolfo Piske <orpi...@users.noreply.github.com> AuthorDate: Tue Aug 8 14:28:06 2023 +0200 (chores) Use log markers for log messages (#905) --- .../camel/component/fhir/FhirCapabilitiesIT.java | 4 ++-- .../org/apache/camel/component/fhir/FhirCreateIT.java | 6 +++--- .../org/apache/camel/component/fhir/FhirDeleteIT.java | 10 +++++----- .../camel/component/fhir/FhirExtraParametersIT.java | 2 +- .../org/apache/camel/component/fhir/FhirHistoryIT.java | 8 ++++---- .../apache/camel/component/fhir/FhirLoadPageIT.java | 8 ++++---- .../org/apache/camel/component/fhir/FhirMetaIT.java | 12 ++++++------ .../apache/camel/component/fhir/FhirOperationIT.java | 8 ++++---- .../org/apache/camel/component/fhir/FhirPatchIT.java | 4 ++-- .../org/apache/camel/component/fhir/FhirReadIT.java | 2 +- .../org/apache/camel/component/fhir/FhirSearchIT.java | 2 +- .../apache/camel/component/fhir/FhirTransactionIT.java | 8 ++++---- .../org/apache/camel/component/fhir/FhirUpdateIT.java | 14 +++++++------- .../apache/camel/component/fhir/FhirValidateIT.java | 4 ++-- .../file/FileChangedReadLockMarkerFileFalseTest.java | 2 +- .../integration/BaseEmbeddedKafkaTestSupport.java | 2 +- .../springboot/openapi/OpenApiAutoConfiguration.java | 3 ++- .../springboot/SpringBootPlatformHttpConsumer.java | 2 +- .../quartz/springboot/StatefulQuartzRouteTest.java | 2 +- .../xquery/springboot/BeanWithXQueryInjectionTest.java | 2 +- .../springboot/XPathSplitChoicePerformanceTest.java | 18 +++++++++--------- .../JdbcAggregateSerializedHeadersTest.java | 4 ++-- .../ValidatorEndpointClearCachedSchemaTest.java | 2 +- .../boot/CamelSpringBootApplicationListener.java | 3 ++- 24 files changed, 67 insertions(+), 65 deletions(-) diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCapabilitiesIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCapabilitiesIT.java index 0a3bbce5ac8..c39943d233a 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCapabilitiesIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCapabilitiesIT.java @@ -62,7 +62,7 @@ public class FhirCapabilitiesIT extends AbstractFhirTestSupport { public void testOfType() throws Exception { org.hl7.fhir.instance.model.api.IBaseConformance result = requestBody("direct://OF_TYPE", CapabilityStatement.class); - LOG.debug("ofType: " + result); + LOG.debug("ofType: {}", result); assertNotNull(result, "ofType result"); assertEquals(Enumerations.PublicationStatus.ACTIVE, ((CapabilityStatement) result).getStatus()); } @@ -75,7 +75,7 @@ public class FhirCapabilitiesIT extends AbstractFhirTestSupport { org.hl7.fhir.instance.model.api.IBaseConformance result = requestBodyAndHeaders("direct://OF_TYPE", CapabilityStatement.class, headers); - LOG.debug("ofType: " + result); + LOG.debug("ofType: {}", result); assertNotNull(result, "ofType result"); assertEquals(Enumerations.PublicationStatus.ACTIVE, ((CapabilityStatement) result).getStatus()); } diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCreateIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCreateIT.java index aba81bd053e..593fdbb0dec 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCreateIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCreateIT.java @@ -64,7 +64,7 @@ public class FhirCreateIT extends AbstractFhirTestSupport { MethodOutcome result = requestBody("direct://RESOURCE", patient); - LOG.debug("resource: " + result); + LOG.debug("resource: {}", result); assertNotNull(result, "resource result"); assertTrue(result.getCreated()); } @@ -76,7 +76,7 @@ public class FhirCreateIT extends AbstractFhirTestSupport { MethodOutcome result = requestBody("direct://RESOURCE_STRING", patientString); - LOG.debug("resource: " + result); + LOG.debug("resource: {}", result); assertNotNull(result, "resource result"); assertTrue(result.getCreated()); } @@ -89,7 +89,7 @@ public class FhirCreateIT extends AbstractFhirTestSupport { headers.put(ExtraParameters.ENCODE_XML.getHeaderName(), Boolean.TRUE); MethodOutcome result = requestBodyAndHeaders("direct://RESOURCE_STRING", patientString, headers); - LOG.debug("resource: " + result); + LOG.debug("resource: {}", result); assertNotNull(result, "resource result"); assertTrue(result.getCreated()); } diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirDeleteIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirDeleteIT.java index 69a07d4138a..3f53ecda931 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirDeleteIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirDeleteIT.java @@ -64,7 +64,7 @@ public class FhirDeleteIT extends AbstractFhirTestSupport { // using org.hl7.fhir.instance.model.api.IBaseResource message body for single parameter "resource" MethodOutcome result = requestBody("direct://RESOURCE", this.patient); - LOG.debug("resource: " + result); + LOG.debug("resource: {}", result); assertNotNull(result, "resource result"); assertFalse(patientExists()); } @@ -76,7 +76,7 @@ public class FhirDeleteIT extends AbstractFhirTestSupport { // using org.hl7.fhir.instance.model.api.IIdType message body for single parameter "id" MethodOutcome result = requestBody("direct://RESOURCE_BY_ID", this.patient.getIdElement()); - LOG.debug("resourceById: " + result); + LOG.debug("resourceById: {}", result); assertNotNull(result, "resourceById result"); assertFalse(patientExists()); } @@ -93,7 +93,7 @@ public class FhirDeleteIT extends AbstractFhirTestSupport { MethodOutcome result = requestBodyAndHeaders("direct://RESOURCE_BY_STRING_ID", null, headers); - LOG.debug("resourceById: " + result); + LOG.debug("resourceById: {}", result); assertNotNull(result, "resourceById result"); assertFalse(patientExists()); } @@ -105,7 +105,7 @@ public class FhirDeleteIT extends AbstractFhirTestSupport { MethodOutcome result = requestBody("direct://RESOURCE_CONDITIONAL_BY_URL", "Patient?given=Vincent&family=Freeman"); - LOG.debug("resourceConditionalByUrl: " + result); + LOG.debug("resourceConditionalByUrl: {}", result); assertNotNull(result, "resourceConditionalByUrl result"); assertFalse(patientExists()); } @@ -119,7 +119,7 @@ public class FhirDeleteIT extends AbstractFhirTestSupport { MethodOutcome result = requestBodyAndHeaders("direct://RESOURCE_CONDITIONAL_BY_URL", "Patient?given=Vincent&family=Freeman", headers); - LOG.debug("resourceConditionalByUrl: " + result); + LOG.debug("resourceConditionalByUrl: {}", result); assertNotNull(result, "resourceConditionalByUrl result"); assertFalse(patientExists()); } diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirExtraParametersIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirExtraParametersIT.java index c77c4e97b07..1807f5f3089 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirExtraParametersIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirExtraParametersIT.java @@ -66,7 +66,7 @@ public class FhirExtraParametersIT extends AbstractFhirTestSupport { Bundle result = requestBodyAndHeaders("direct://SEARCH_BY_URL", url, headers); - LOG.debug("searchByUrl: " + result); + LOG.debug("searchByUrl: {}", result); assertNotNull(result, "searchByUrl result"); Patient patient = (Patient) result.getEntry().get(0).getResource(); assertNotNull(patient); diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirHistoryIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirHistoryIT.java index 8182b85affa..a2af2de7992 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirHistoryIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirHistoryIT.java @@ -69,7 +69,7 @@ public class FhirHistoryIT extends AbstractFhirTestSupport { Bundle result = requestBodyAndHeaders("direct://ON_INSTANCE", null, headers); - LOG.debug("onInstance: " + result); + LOG.debug("onInstance: {}", result); assertNotNull(result, "onInstance result"); assertEquals(1, result.getEntry().size()); } @@ -81,7 +81,7 @@ public class FhirHistoryIT extends AbstractFhirTestSupport { headers.put("CamelFhir.count", 1); Bundle result = requestBodyAndHeaders("direct://ON_SERVER", null, headers); - LOG.debug("onServer: " + result); + LOG.debug("onServer: {}", result); assertNotNull(result, "onServer result"); assertEquals(1, result.getEntry().size()); } @@ -98,7 +98,7 @@ public class FhirHistoryIT extends AbstractFhirTestSupport { Bundle result = requestBodyAndHeaders("direct://ON_TYPE", null, headers); - LOG.debug("onType: " + result); + LOG.debug("onType: {}", result); assertNotNull(result, "onType result"); assertEquals(1, result.getEntry().size()); } @@ -117,7 +117,7 @@ public class FhirHistoryIT extends AbstractFhirTestSupport { Bundle result = requestBodyAndHeaders("direct://ON_TYPE", null, headers); - LOG.debug("onType: " + result); + LOG.debug("onType: {}", result); assertNotNull(result, "onType result"); assertEquals(1, result.getEntry().size()); } diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirLoadPageIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirLoadPageIT.java index 899f6754bd6..f20dfc00ef4 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirLoadPageIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirLoadPageIT.java @@ -83,7 +83,7 @@ public class FhirLoadPageIT extends AbstractFhirTestSupport { IBaseBundle result = requestBodyAndHeaders("direct://BY_URL", null, headers); - LOG.debug("byUrl: " + result); + LOG.debug("byUrl: {}", result); assertNotNull(result, "byUrl result"); } @@ -99,7 +99,7 @@ public class FhirLoadPageIT extends AbstractFhirTestSupport { Bundle result = requestBody("direct://NEXT", bundle); assertNotNull(result, "next result"); - LOG.debug("next: " + result); + LOG.debug("next: {}", result); } @Test @@ -117,7 +117,7 @@ public class FhirLoadPageIT extends AbstractFhirTestSupport { // using org.hl7.fhir.instance.model.api.IBaseBundle message body for single parameter "bundle" Bundle result = requestBody("direct://PREVIOUS", bundle); - LOG.debug("previous: " + result); + LOG.debug("previous: {}", result); assertNotNull(result, "previous result"); } @@ -138,7 +138,7 @@ public class FhirLoadPageIT extends AbstractFhirTestSupport { // using org.hl7.fhir.instance.model.api.IBaseBundle message body for single parameter "bundle" Bundle result = requestBodyAndHeaders("direct://PREVIOUS", bundle, headers); - LOG.debug("previous: " + result); + LOG.debug("previous: {}", result); assertNotNull(result, "previous result"); } diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirMetaIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirMetaIT.java index 9f809a37437..60288f436d4 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirMetaIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirMetaIT.java @@ -74,7 +74,7 @@ public class FhirMetaIT extends AbstractFhirTestSupport { IBaseMetaType result = requestBodyAndHeaders("direct://ADD", null, headers); - LOG.debug("add: " + result); + LOG.debug("add: {}", result); assertNotNull(result, "add result"); assertEquals(1, result.getTag().size()); } @@ -99,7 +99,7 @@ public class FhirMetaIT extends AbstractFhirTestSupport { IBaseMetaType result = requestBodyAndHeaders("direct://DELETE", null, headers); - LOG.debug("delete: " + result); + LOG.debug("delete: {}", result); assertNotNull(result, "delete result"); assertEquals(0, result.getTag().size()); } @@ -114,7 +114,7 @@ public class FhirMetaIT extends AbstractFhirTestSupport { IBaseMetaType result = requestBodyAndHeaders("direct://GET_FROM_RESOURCE", null, headers); - LOG.debug("getFromResource: " + result); + LOG.debug("getFromResource: {}", result); assertNotNull(result, "getFromResource result"); assertEquals(0, result.getTag().size()); } @@ -124,7 +124,7 @@ public class FhirMetaIT extends AbstractFhirTestSupport { // using Class message body for single parameter "metaType" IBaseMetaType result = requestBody("direct://GET_FROM_SERVER", Meta.class); assertNotNull(result, "getFromServer result"); - LOG.debug("getFromServer: " + result); + LOG.debug("getFromServer: {}", result); } @Test @@ -137,7 +137,7 @@ public class FhirMetaIT extends AbstractFhirTestSupport { IBaseMetaType result = requestBodyAndHeaders("direct://GET_FROM_TYPE", null, headers); - LOG.debug("getFromType: " + result); + LOG.debug("getFromType: {}", result); assertNotNull(result, "getFromType result"); } @@ -152,7 +152,7 @@ public class FhirMetaIT extends AbstractFhirTestSupport { Meta result = requestBodyAndHeaders("direct://GET_FROM_TYPE", null, headers); - LOG.debug("getFromType: " + result); + LOG.debug("getFromType: {}", result); assertNotNull(result, "getFromType result"); } diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java index 7a398ab0603..57e3e52c282 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java @@ -79,7 +79,7 @@ public class FhirOperationIT extends AbstractFhirTestSupport { final Parameters result = requestBodyAndHeaders("direct://ON_INSTANCE", null, headers); - LOG.debug("onInstance: " + result); + LOG.debug("onInstance: {}", result); assertNotNull(result, "onInstance result"); Bundle bundle = (Bundle) result.getParameter().get(0).getResource(); assertNotNull(bundle, "onInstance result"); @@ -106,7 +106,7 @@ public class FhirOperationIT extends AbstractFhirTestSupport { final Parameters result = requestBodyAndHeaders("direct://ON_INSTANCE_VERSION", null, headers); - LOG.debug("onInstance: " + result); + LOG.debug("onInstance: {}", result); assertNotNull(result, "onInstance result"); Bundle bundle = (Bundle) result.getParameter().get(0).getResource(); assertNotNull(bundle, "onInstance result"); @@ -153,7 +153,7 @@ public class FhirOperationIT extends AbstractFhirTestSupport { final org.hl7.fhir.instance.model.api.IBaseResource result = requestBodyAndHeaders("direct://ON_TYPE", null, headers); assertNotNull(result, "onType result"); - LOG.debug("onType: " + result); + LOG.debug("onType: {}", result); } @Disabled("Not implemented yet in HAPI FHIR server side, see" @@ -175,7 +175,7 @@ public class FhirOperationIT extends AbstractFhirTestSupport { = requestBodyAndHeaders("direct://PROCESS_MESSAGE", null, headers); assertNotNull(result, "processMessage result"); - LOG.debug("processMessage: " + result); + LOG.debug("processMessage: {}", result); } @Configuration diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirPatchIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirPatchIT.java index 3295682d5e7..efb2ab3250f 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirPatchIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirPatchIT.java @@ -125,7 +125,7 @@ public class FhirPatchIT extends AbstractFhirTestSupport { MethodOutcome result = requestBodyAndHeaders("direct://PATCH_BY_URL", null, headers); assertNotNull(result, "patchByUrl result"); - LOG.debug("patchByUrl: " + result); + LOG.debug("patchByUrl: {}", result); assertActive(result); } @@ -153,7 +153,7 @@ public class FhirPatchIT extends AbstractFhirTestSupport { } private void assertActive(MethodOutcome result) { - LOG.debug("result: " + result); + LOG.debug("result: {}", result); IIdType id = result.getId(); Patient patient = fhirClient.read().resource(Patient.class).withId(id).preferResponseType(Patient.class).execute(); diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirReadIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirReadIT.java index b42fb1660b5..86afa79675f 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirReadIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirReadIT.java @@ -233,7 +233,7 @@ public class FhirReadIT extends AbstractFhirTestSupport { } private void assertValidResponse(Patient result) { - LOG.debug("response: " + result); + LOG.debug("response: {}", result); assertNotNull(result, "resourceByUrl result"); assertEquals("Freeman", result.getName().get(0).getFamily()); } diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirSearchIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirSearchIT.java index 0e28eba7a12..5d5f1e20b4c 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirSearchIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirSearchIT.java @@ -59,7 +59,7 @@ public class FhirSearchIT extends AbstractFhirTestSupport { String url = "Patient?given=Vincent&family=Freeman&_format=json"; Bundle result = requestBody("direct://SEARCH_BY_URL", url); - LOG.debug("searchByUrl: " + result); + LOG.debug("searchByUrl: {}", result); assertNotNull(result, "searchByUrl result"); Patient patient = (Patient) result.getEntry().get(0).getResource(); assertNotNull(patient); diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirTransactionIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirTransactionIT.java index 4d1a7f7e9e7..60372c5c4e6 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirTransactionIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirTransactionIT.java @@ -71,7 +71,7 @@ public class FhirTransactionIT extends AbstractFhirTestSupport { assertNotNull(result, "withBundle result"); assertTrue(result.getEntry().get(0).getResponse().getStatus().contains("Created")); - LOG.debug("withBundle: " + result); + LOG.debug("withBundle: {}", result); } @Test @@ -84,7 +84,7 @@ public class FhirTransactionIT extends AbstractFhirTestSupport { assertNotNull(result, "withBundle result"); assertTrue(result.contains("Bundle")); - LOG.debug("withBundle: " + result); + LOG.debug("withBundle: {}", result); } @Test @@ -99,7 +99,7 @@ public class FhirTransactionIT extends AbstractFhirTestSupport { List<IBaseResource> result = requestBody("direct://WITH_RESOURCES", patients); assertNotNull(result, "withResources result"); - LOG.debug("withResources: " + result); + LOG.debug("withResources: {}", result); assertEquals(2, result.size()); } @@ -117,7 +117,7 @@ public class FhirTransactionIT extends AbstractFhirTestSupport { List<IBaseResource> result = requestBodyAndHeaders("direct://WITH_RESOURCES", patients, headers); assertNotNull(result, "withResources result"); - LOG.debug("withResources: " + result); + LOG.debug("withResources: {}", result); assertEquals(2, result.size()); } diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirUpdateIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirUpdateIT.java index 389d0c7dae3..c1056cc0bb2 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirUpdateIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirUpdateIT.java @@ -77,7 +77,7 @@ public class FhirUpdateIT extends AbstractFhirTestSupport { MethodOutcome result = requestBodyAndHeaders("direct://RESOURCE", null, headers); assertNotNull(result, "resource result"); - LOG.debug("resource: " + result); + LOG.debug("resource: {}", result); assertEquals(date, ((Patient) result.getResource()).getBirthDate(), "Birth date not updated!"); } @@ -95,7 +95,7 @@ public class FhirUpdateIT extends AbstractFhirTestSupport { MethodOutcome result = requestBodyAndHeaders("direct://RESOURCE", null, headers); assertNotNull(result, "resource result"); - LOG.debug("resource: " + result); + LOG.debug("resource: {}", result); assertEquals(date, ((Patient) result.getResource()).getBirthDate(), "Birth date not updated!"); } @@ -115,7 +115,7 @@ public class FhirUpdateIT extends AbstractFhirTestSupport { MethodOutcome result = requestBodyAndHeaders("direct://RESOURCE_WITH_STRING_ID", null, headers); assertNotNull(result, "resource result"); - LOG.debug("resource: " + result); + LOG.debug("resource: {}", result); assertEquals(date, ((Patient) result.getResource()).getBirthDate(), "Birth date not updated!"); } @@ -135,7 +135,7 @@ public class FhirUpdateIT extends AbstractFhirTestSupport { MethodOutcome result = requestBodyAndHeaders("direct://RESOURCE_AS_STRING", null, headers); assertNotNull(result, "resource result"); - LOG.debug("resource: " + result); + LOG.debug("resource: {}", result); assertEquals(date, ((Patient) result.getResource()).getBirthDate(), "Birth date not updated!"); } @@ -155,7 +155,7 @@ public class FhirUpdateIT extends AbstractFhirTestSupport { MethodOutcome result = requestBodyAndHeaders("direct://RESOURCE_AS_STRING_WITH_STRING_ID", null, headers); assertNotNull(result, "resource result"); - LOG.debug("resource: " + result); + LOG.debug("resource: {}", result); assertEquals(date, ((Patient) result.getResource()).getBirthDate(), "Birth date not updated!"); } @@ -176,7 +176,7 @@ public class FhirUpdateIT extends AbstractFhirTestSupport { MethodOutcome result = requestBodyAndHeaders("direct://RESOURCE_BY_SEARCH_URL", null, headers); assertNotNull(result, "resource result"); - LOG.debug("resource: " + result); + LOG.debug("resource: {}", result); assertEquals(date, ((Patient) result.getResource()).getBirthDate(), "Birth date not updated!"); } @@ -197,7 +197,7 @@ public class FhirUpdateIT extends AbstractFhirTestSupport { MethodOutcome result = requestBodyAndHeaders("direct://RESOURCE_BY_SEARCH_URL_AND_RESOURCE_AS_STRING", null, headers); assertNotNull(result, "resource result"); - LOG.debug("resource: " + result); + LOG.debug("resource: {}", result); assertEquals(date, ((Patient) result.getResource()).getBirthDate(), "Birth date not updated!"); } diff --git a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirValidateIT.java b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirValidateIT.java index d033f6d61c5..102f7377ee6 100644 --- a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirValidateIT.java +++ b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirValidateIT.java @@ -71,7 +71,7 @@ public class FhirValidateIT extends AbstractFhirTestSupport { MethodOutcome result = requestBody("direct://RESOURCE", bobbyHebb); assertNotNull(result, "resource result"); - LOG.debug("resource: " + result); + LOG.debug("resource: {}", result); OperationOutcome operationOutcome = (OperationOutcome) result.getOperationOutcome(); assertNotNull(operationOutcome); @@ -93,7 +93,7 @@ public class FhirValidateIT extends AbstractFhirTestSupport { = requestBody("direct://RESOURCE_AS_STRING", this.fhirContext.newXmlParser().encodeResourceToString(bobbyHebb)); assertNotNull(result, "resource result"); - LOG.debug("resource: " + result); + LOG.debug("resource: {}", result); OperationOutcome operationOutcome = (OperationOutcome) result.getOperationOutcome(); assertNotNull(operationOutcome); diff --git a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileChangedReadLockMarkerFileFalseTest.java b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileChangedReadLockMarkerFileFalseTest.java index 1e835bde363..c04cecba377 100644 --- a/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileChangedReadLockMarkerFileFalseTest.java +++ b/components-starter/camel-file-starter/src/test/java/org/apache/camel/component/file/FileChangedReadLockMarkerFileFalseTest.java @@ -84,7 +84,7 @@ public class FileChangedReadLockMarkerFileFalseTest extends BaseFile { try (OutputStream fos = Files.newOutputStream(testFile("in/slowfile.dat"))) { for (int i = 0; i < 20; i++) { fos.write(("Line " + i + LS).getBytes()); - LOG.debug("Writing line " + i); + LOG.debug("Writing line {}", i); Thread.sleep(50); } fos.flush(); diff --git a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/BaseEmbeddedKafkaTestSupport.java b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/BaseEmbeddedKafkaTestSupport.java index 3416476f43c..4efd01aa80b 100644 --- a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/BaseEmbeddedKafkaTestSupport.java +++ b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/BaseEmbeddedKafkaTestSupport.java @@ -49,7 +49,7 @@ public abstract class BaseEmbeddedKafkaTestSupport { @BeforeAll public static void beforeClass() { - LOG.info("### Embedded Kafka cluster broker list: " + service.getBootstrapServers()); + LOG.info("### Embedded Kafka cluster broker list: {}", service.getBootstrapServers()); System.setProperty("bootstrapServers", service.getBootstrapServers()); } diff --git a/components-starter/camel-openapi-java-starter/src/main/java/org/apache/camel/springboot/openapi/OpenApiAutoConfiguration.java b/components-starter/camel-openapi-java-starter/src/main/java/org/apache/camel/springboot/openapi/OpenApiAutoConfiguration.java index cb329cf3b6f..5b5215b28d2 100644 --- a/components-starter/camel-openapi-java-starter/src/main/java/org/apache/camel/springboot/openapi/OpenApiAutoConfiguration.java +++ b/components-starter/camel-openapi-java-starter/src/main/java/org/apache/camel/springboot/openapi/OpenApiAutoConfiguration.java @@ -95,7 +95,8 @@ public class OpenApiAutoConfiguration { // do not copy servers as we use the spring-boot configured setting } } catch (Exception e) { - LOG.warn("Error generating OpenAPI from Camel Rest DSL due to: " + e.getMessage() + ". This exception is ignored.", e); + LOG.warn("Error generating OpenAPI from Camel Rest DSL due to: {}. This exception is ignored.", + e.getMessage(), e); } } diff --git a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpConsumer.java b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpConsumer.java index 64dc9eb5145..6c07c2cd197 100644 --- a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpConsumer.java +++ b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpConsumer.java @@ -62,7 +62,7 @@ public class SpringBootPlatformHttpConsumer extends DefaultConsumer implements S handleService(request, response); } catch (Exception e) { // do not leak exception back to caller - LOG.warn("Error handling request due to: " + e.getMessage(), e); + LOG.warn("Error handling request due to: {}", e.getMessage(), e); try { if (!response.isCommitted()) { response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); diff --git a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/StatefulQuartzRouteTest.java b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/StatefulQuartzRouteTest.java index f14ee58731c..08e2a18ae93 100644 --- a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/StatefulQuartzRouteTest.java +++ b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/StatefulQuartzRouteTest.java @@ -78,7 +78,7 @@ public class StatefulQuartzRouteTest extends BaseQuartzTest { List<Exchange> list = resultEndpoint.getReceivedExchanges(); for (Exchange exchange : list) { Message in = exchange.getIn(); - log.debug("Received: " + in + " with headers: " + in.getHeaders()); + log.debug("Received: {} with headers: {}", in, in.getHeaders()); } } diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/BeanWithXQueryInjectionTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/BeanWithXQueryInjectionTest.java index d06c942fa59..0a8dc0ceee9 100644 --- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/BeanWithXQueryInjectionTest.java +++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/BeanWithXQueryInjectionTest.java @@ -104,7 +104,7 @@ public class BeanWithXQueryInjectionTest { public void read(String body, @XQuery("/foo/@id") String foo) { this.foo = foo; this.body = body; - LOG.info("read() method called on " + this); + LOG.info("read() method called on {}", this); } } } diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XPathSplitChoicePerformanceTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XPathSplitChoicePerformanceTest.java index 1e14964223f..75f6b0515c7 100644 --- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XPathSplitChoicePerformanceTest.java +++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XPathSplitChoicePerformanceTest.java @@ -95,12 +95,12 @@ public class XPathSplitChoicePerformanceTest extends FromFileBase { NotifyBuilder notify = new NotifyBuilder(context).whenDone(size).create(); boolean matches = notify.matches(60, TimeUnit.SECONDS); - LOG.info("Processed file with " + size + " elements in: " + TimeUtils.printDuration(watch.taken())); + LOG.info("Processed file with {} elements in: {}", size, TimeUtils.printDuration(watch.taken())); - LOG.info("Processed " + tiny.get() + " tiny messages"); - LOG.info("Processed " + small.get() + " small messages"); - LOG.info("Processed " + med.get() + " medium messages"); - LOG.info("Processed " + large.get() + " large messages"); + LOG.info("Processed {} tiny messages", tiny.get()); + LOG.info("Processed {} small messages", small.get()); + LOG.info("Processed {} medium messages", med.get()); + LOG.info("Processed {} large messages", large.get()); assertEquals((size / 10) * 4, tiny.get()); assertEquals((size / 10) * 2, small.get()); @@ -139,7 +139,7 @@ public class XPathSplitChoicePerformanceTest extends FromFileBase { int num = tiny.incrementAndGet(); if (num % 100 == 0) { - log.info("Processed " + num + " tiny messages"); + log.info("Processed {} tiny messages", num); log.debug(xml); } } @@ -152,7 +152,7 @@ public class XPathSplitChoicePerformanceTest extends FromFileBase { int num = small.incrementAndGet(); if (num % 100 == 0) { - log.info("Processed " + num + " small messages"); + log.info("Processed {} small messages", num); log.debug(xml); } } @@ -165,7 +165,7 @@ public class XPathSplitChoicePerformanceTest extends FromFileBase { int num = med.incrementAndGet(); if (num % 100 == 0) { - log.info("Processed " + num + " medium messages"); + log.info("Processed {} medium messages", num); log.debug(xml); } } @@ -178,7 +178,7 @@ public class XPathSplitChoicePerformanceTest extends FromFileBase { int num = large.incrementAndGet(); if (num % 100 == 0) { - log.info("Processed " + num + " large messages"); + log.info("Processed {} large messages", num); log.debug(xml); } } diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/aggregation/JdbcAggregateSerializedHeadersTest.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/aggregation/JdbcAggregateSerializedHeadersTest.java index 440dc311014..0e94b1e860e 100644 --- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/aggregation/JdbcAggregateSerializedHeadersTest.java +++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/aggregation/JdbcAggregateSerializedHeadersTest.java @@ -68,7 +68,7 @@ public class JdbcAggregateSerializedHeadersTest extends BaseSql { resultEndpoint.expectedMinimumMessageCount(1); resultEndpoint.setResultWaitTime(50 * 1000); - LOG.info("Staring to send " + SIZE + " messages."); + LOG.info("Staring to send {} messages.", SIZE); for (int i = 0; i < SIZE; i++) { final int value = 1; @@ -77,7 +77,7 @@ public class JdbcAggregateSerializedHeadersTest extends BaseSql { template.sendBodyAndHeader("seda:start?size=" + SIZE, value, "id", headerDto); } - LOG.info("Sending all " + SIZE + " message done. Now waiting for aggregation to complete."); + LOG.info("Sending all {} message done. Now waiting for aggregation to complete.", SIZE); assertMockEndpointsSatisfied(); } diff --git a/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorEndpointClearCachedSchemaTest.java b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorEndpointClearCachedSchemaTest.java index d1a86703744..9529fed0272 100644 --- a/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorEndpointClearCachedSchemaTest.java +++ b/components-starter/camel-validator-starter/src/test/java/org/apache/camel/component/validator/ValidatorEndpointClearCachedSchemaTest.java @@ -144,7 +144,7 @@ public class ValidatorEndpointClearCachedSchemaTest extends ContextTestSupport { } Collection<Endpoint> endpoints = context.getEndpoints(); for (Endpoint endpoint : endpoints) { - LOG.info("Endpoint URI: " + endpoint.getEndpointUri()); + LOG.info("Endpoint URI: {}", endpoint.getEndpointUri()); if (endpoint.getEndpointUri().startsWith("validator:")) { ValidatorEndpoint xsltEndpoint = (ValidatorEndpoint) endpoint; xsltEndpoint.clearCachedSchema(); diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationListener.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationListener.java index e8e9f11c231..ad7a738ad4e 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationListener.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationListener.java @@ -198,7 +198,8 @@ public class CamelSpringBootApplicationListener implements ApplicationListener<C try { camelContextConfiguration.afterApplicationStart(camelContext); } catch (Exception e) { - LOG.warn("Error during calling afterApplicationStart due " + e.getMessage() + ". This exception is ignored", e); + LOG.warn("Error during calling afterApplicationStart due {}. This exception is ignored", + e.getMessage(), e); } } }