This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9edf3b84836a1b604dc8bc2e6a0ce0ffde1cafeb
Author: lburgazzoli <lburgazz...@gmail.com>
AuthorDate: Wed Mar 18 10:08:56 2020 +0100
Add slf4j implementation to avoid warning when running tests
---
core/camel-core-xml/pom.xml | 17 +++++++++++
.../core/xml/AbstractCamelContextFactoryBean.java | 10 +------
.../src/test/resources/log4j2.properties | 33 ++++++++++++++++++++++
3 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/core/camel-core-xml/pom.xml b/core/camel-core-xml/pom.xml
index fb73bd6..98f8b2f 100644
--- a/core/camel-core-xml/pom.xml
+++ b/core/camel-core-xml/pom.xml
@@ -55,6 +55,23 @@
<version>${assertj-version}</version>
<scope>test</scope>
</dependency>
+
+ <!-- logging for testing -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git
a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
index 135d674..6cfb14f 100644
---
a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
+++
b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
@@ -972,15 +972,7 @@ public abstract class AbstractCamelContextFactoryBean<T
extends ModelCamelContex
context.getTypeConverterRegistry().setTypeConverterExistsLoggingLevel(getTypeConverterExistsLoggingLevel());
}
if (getRestConfiguration() != null) {
- RestConfiguration config = context.getRestConfiguration();
- if (config == null) {
- config = new RestConfiguration();
- context.setRestConfiguration(config);
- }
- if (context.getRestConfiguration() != null) {
- // merge on top of existing
- getRestConfiguration().asRestConfiguration(context, config);
- }
+ getRestConfiguration().asRestConfiguration(context,
context.getRestConfiguration());
}
if (getDefaultServiceCallConfiguration() != null) {
context.setServiceCallConfiguration(getDefaultServiceCallConfiguration());
diff --git a/core/camel-core-xml/src/test/resources/log4j2.properties
b/core/camel-core-xml/src/test/resources/log4j2.properties
new file mode 100644
index 0000000..2d09af6
--- /dev/null
+++ b/core/camel-core-xml/src/test/resources/log4j2.properties
@@ -0,0 +1,33 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+
+appender.console.type = Console
+appender.console.name = console
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+appender.file.type = File
+appender.file.name = file
+appender.file.fileName = target/camel-core-xml-test.log
+appender.file.append = true
+appender.file.layout.type = PatternLayout
+appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+rootLogger.level = INFO
+
+rootLogger.appenderRef.file.ref = file
+#rootLogger.appenderRef.console.ref = console
