You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/06/02 05:50:55 UTC
[camel] branch main updated (092010e1fc2 -> 943e5013269)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 092010e1fc2 Added unit test based on https://github.com/apache/camel/pull/7686
add 03f58e9f1e2 Unit test to reproduce bug in CAMEL-18160
new 6d0adb81403 Merge branch 'CAMEL-18160' of https://github.com/klease/camel into klease-CAMEL-18160
new 6cc4d55ef7c CAMEL-18160: camel-spring-xml - Setup type converter registry eager to allow typeConverterExists=Override to work.
new 943e5013269 Merge branch 'klease-CAMEL-18160'
The 3 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.
Summary of changes:
.../camel/spring}/impl/converter/MyConverters.java | 7 ++++---
...t.java => SpringTypeConvertersOverrideTest.java} | 8 +++++---
.../src/test/resources/log4j2.properties | 2 ++
...est.xml => SpringTypeConvertersOverrideTest.xml} | 4 +++-
.../core/xml/AbstractCamelContextFactoryBean.java | 21 ++++++++++-----------
5 files changed, 24 insertions(+), 18 deletions(-)
copy {core/camel-core/src/test/java/org/apache/camel => components/camel-spring-xml/src/test/java/org/apache/camel/spring}/impl/converter/MyConverters.java (87%)
copy components/camel-spring-xml/src/test/java/org/apache/camel/spring/impl/converter/{SpringTypeConvertersTest.java => SpringTypeConvertersOverrideTest.java} (84%)
copy components/camel-spring-xml/src/test/resources/org/apache/camel/spring/impl/converter/{SpringTypeConvertersTest.xml => SpringTypeConvertersOverrideTest.xml} (86%)
[camel] 02/03: CAMEL-18160: camel-spring-xml - Setup type converter registry eager to allow typeConverterExists=Override to work.
Posted by da...@apache.org.
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
commit 6cc4d55ef7c0f9fac3fa0ed96c03119f6342e93e
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jun 2 07:50:36 2022 +0200
CAMEL-18160: camel-spring-xml - Setup type converter registry eager to allow typeConverterExists=Override to work.
---
.../core/xml/AbstractCamelContextFactoryBean.java | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
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 c7ca9132d48..e6fe2111520 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
@@ -211,7 +211,16 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
LOG.info("Using custom TypeConverterRegistry: {}", tcr);
getContext().setTypeConverterRegistry(tcr);
}
-
+ if (getTypeConverterStatisticsEnabled() != null) {
+ getContext().setTypeConverterStatisticsEnabled(
+ CamelContextHelper.parseBoolean(getContext(), getTypeConverterStatisticsEnabled()));
+ }
+ if (getTypeConverterExists() != null) {
+ getContext().getTypeConverterRegistry().setTypeConverterExists(getTypeConverterExists());
+ }
+ if (getTypeConverterExistsLoggingLevel() != null) {
+ getContext().getTypeConverterRegistry().setTypeConverterExistsLoggingLevel(getTypeConverterExistsLoggingLevel());
+ }
// setup whether to load type converters as early as possible
if (getLoadTypeConverters() != null) {
String s = getContext().resolvePropertyPlaceholders(getLoadTypeConverters());
@@ -1246,20 +1255,10 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
if (getValidators() != null) {
context.setValidators(getValidators().getValidators());
}
- if (getTypeConverterStatisticsEnabled() != null) {
- context.setTypeConverterStatisticsEnabled(
- CamelContextHelper.parseBoolean(context, getTypeConverterStatisticsEnabled()));
- }
if (getInflightRepositoryBrowseEnabled() != null) {
context.getInflightRepository()
.setInflightBrowseEnabled(CamelContextHelper.parseBoolean(context, getInflightRepositoryBrowseEnabled()));
}
- if (getTypeConverterExists() != null) {
- context.getTypeConverterRegistry().setTypeConverterExists(getTypeConverterExists());
- }
- if (getTypeConverterExistsLoggingLevel() != null) {
- context.getTypeConverterRegistry().setTypeConverterExistsLoggingLevel(getTypeConverterExistsLoggingLevel());
- }
if (getRestConfiguration() != null) {
getRestConfiguration().asRestConfiguration(context, context.getRestConfiguration());
}
[camel] 03/03: Merge branch 'klease-CAMEL-18160'
Posted by da...@apache.org.
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
commit 943e50132697a5213bdca23f081ced73702c7928
Merge: 092010e1fc2 6cc4d55ef7c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jun 2 07:50:48 2022 +0200
Merge branch 'klease-CAMEL-18160'
.../camel/spring/impl/converter/MyConverters.java | 37 +++++++++++++++++
.../SpringTypeConvertersOverrideTest.java | 48 ++++++++++++++++++++++
.../src/test/resources/log4j2.properties | 2 +
.../converter/SpringTypeConvertersOverrideTest.xml | 36 ++++++++++++++++
.../core/xml/AbstractCamelContextFactoryBean.java | 21 +++++-----
5 files changed, 133 insertions(+), 11 deletions(-)
[camel] 01/03: Merge branch 'CAMEL-18160' of https://github.com/klease/camel into klease-CAMEL-18160
Posted by da...@apache.org.
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
commit 6d0adb8140323bd54e6e7f204b3fe5b84811972e
Merge: 092010e1fc2 03f58e9f1e2
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jun 2 07:37:45 2022 +0200
Merge branch 'CAMEL-18160' of https://github.com/klease/camel into klease-CAMEL-18160
.../camel/spring/impl/converter/MyConverters.java | 37 +++++++++++++++++
.../SpringTypeConvertersOverrideTest.java | 48 ++++++++++++++++++++++
.../src/test/resources/log4j2.properties | 2 +
.../converter/SpringTypeConvertersOverrideTest.xml | 36 ++++++++++++++++
4 files changed, 123 insertions(+)