This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new dfd45c6 CAMEL-15999: Fix -starter JARs for components that would
register a spring converter from string to object which causes property
placeholder to not work.
dfd45c6 is described below
commit dfd45c69120fac3a8c4ba16c9a07e7257d2f58ad
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Jan 6 15:48:42 2021 +0100
CAMEL-15999: Fix -starter JARs for components that would register a spring
converter from string to object which causes property placeholder to not work.
---
.../atomix/client/map/springboot/AtomixMapComponentConverter.java | 2 --
.../client/multimap/springboot/AtomixMultiMapComponentConverter.java | 2 --
.../caffeine/cache/springboot/CaffeineCacheComponentConverter.java | 2 --
.../caffeine/load/springboot/CaffeineLoadCacheComponentConverter.java | 2 --
.../camel/component/ehcache/springboot/EhcacheComponentConverter.java | 2 --
.../ignite/cache/springboot/IgniteCacheComponentConverter.java | 2 --
.../ignite/compute/springboot/IgniteComputeComponentConverter.java | 2 --
.../ignite/events/springboot/IgniteEventsComponentConverter.java | 2 --
.../ignite/idgen/springboot/IgniteIdGenComponentConverter.java | 2 --
.../messaging/springboot/IgniteMessagingComponentConverter.java | 2 --
.../ignite/queue/springboot/IgniteQueueComponentConverter.java | 2 --
.../component/ignite/set/springboot/IgniteSetComponentConverter.java | 2 --
.../component/infinispan/springboot/InfinispanComponentConverter.java | 2 --
.../component/undertow/springboot/UndertowComponentConverter.java | 2 --
.../xmlsecurity/springboot/XmlVerifierComponentConverter.java | 2 --
.../camel/springboot/maven/SpringBootAutoConfigurationMojo.java | 4 ++++
16 files changed, 4 insertions(+), 30 deletions(-)
diff --git
a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/map/springboot/AtomixMapComponentConverter.java
b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/map/springboot/AtomixMapComponentConverter.java
index c8cfa00..23bf4be 100644
---
a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/map/springboot/AtomixMapComponentConverter.java
+++
b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/map/springboot/AtomixMapComponentConverter.java
@@ -42,7 +42,6 @@ public class AtomixMapComponentConverter
Set<ConvertiblePair> answer = new LinkedHashSet<>();
answer.add(new ConvertiblePair(String.class, io.atomix.Atomix.class));
answer.add(new ConvertiblePair(String.class,
org.apache.camel.component.atomix.client.map.AtomixMapConfiguration.class));
- answer.add(new ConvertiblePair(String.class, java.lang.Object.class));
answer.add(new ConvertiblePair(String.class,
java.util.Properties.class));
return answer;
}
@@ -62,7 +61,6 @@ public class AtomixMapComponentConverter
switch (targetType.getName()) {
case "io.atomix.Atomix": return
camelContext.getRegistry().lookupByNameAndType(ref, io.atomix.Atomix.class);
case
"org.apache.camel.component.atomix.client.map.AtomixMapConfiguration": return
camelContext.getRegistry().lookupByNameAndType(ref,
org.apache.camel.component.atomix.client.map.AtomixMapConfiguration.class);
- case "java.lang.Object": return
camelContext.getRegistry().lookupByNameAndType(ref, java.lang.Object.class);
case "java.util.Properties": return
camelContext.getRegistry().lookupByNameAndType(ref, java.util.Properties.class);
}
return null;
diff --git
a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/multimap/springboot/AtomixMultiMapComponentConverter.java
b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/multimap/springboot/AtomixMultiMapComponentConverter.java
index 259b02b..49f7432 100644
---
a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/multimap/springboot/AtomixMultiMapComponentConverter.java
+++
b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/multimap/springboot/AtomixMultiMapComponentConverter.java
@@ -42,7 +42,6 @@ public class AtomixMultiMapComponentConverter
Set<ConvertiblePair> answer = new LinkedHashSet<>();
answer.add(new ConvertiblePair(String.class, io.atomix.Atomix.class));
answer.add(new ConvertiblePair(String.class,
org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration.class));
- answer.add(new ConvertiblePair(String.class, java.lang.Object.class));
answer.add(new ConvertiblePair(String.class,
java.util.Properties.class));
return answer;
}
@@ -62,7 +61,6 @@ public class AtomixMultiMapComponentConverter
switch (targetType.getName()) {
case "io.atomix.Atomix": return
camelContext.getRegistry().lookupByNameAndType(ref, io.atomix.Atomix.class);
case
"org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration":
return camelContext.getRegistry().lookupByNameAndType(ref,
org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration.class);
- case "java.lang.Object": return
camelContext.getRegistry().lookupByNameAndType(ref, java.lang.Object.class);
case "java.util.Properties": return
camelContext.getRegistry().lookupByNameAndType(ref, java.util.Properties.class);
}
return null;
diff --git
a/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentConverter.java
b/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentConverter.java
index d09c18a..68e2697 100644
---
a/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentConverter.java
+++
b/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentConverter.java
@@ -41,7 +41,6 @@ public class CaffeineCacheComponentConverter
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
answer.add(new ConvertiblePair(String.class,
com.github.benmanes.caffeine.cache.CacheLoader.class));
- answer.add(new ConvertiblePair(String.class, java.lang.Object.class));
answer.add(new ConvertiblePair(String.class,
com.github.benmanes.caffeine.cache.RemovalListener.class));
answer.add(new ConvertiblePair(String.class,
com.github.benmanes.caffeine.cache.stats.StatsCounter.class));
answer.add(new ConvertiblePair(String.class,
org.apache.camel.component.caffeine.CaffeineConfiguration.class));
@@ -62,7 +61,6 @@ public class CaffeineCacheComponentConverter
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
case "com.github.benmanes.caffeine.cache.CacheLoader": return
camelContext.getRegistry().lookupByNameAndType(ref,
com.github.benmanes.caffeine.cache.CacheLoader.class);
- case "java.lang.Object": return
camelContext.getRegistry().lookupByNameAndType(ref, java.lang.Object.class);
case "com.github.benmanes.caffeine.cache.RemovalListener": return
camelContext.getRegistry().lookupByNameAndType(ref,
com.github.benmanes.caffeine.cache.RemovalListener.class);
case "com.github.benmanes.caffeine.cache.stats.StatsCounter":
return camelContext.getRegistry().lookupByNameAndType(ref,
com.github.benmanes.caffeine.cache.stats.StatsCounter.class);
case "org.apache.camel.component.caffeine.CaffeineConfiguration":
return camelContext.getRegistry().lookupByNameAndType(ref,
org.apache.camel.component.caffeine.CaffeineConfiguration.class);
diff --git
a/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentConverter.java
b/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentConverter.java
index 4a901f1..d1b2e36 100644
---
a/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentConverter.java
+++
b/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentConverter.java
@@ -41,7 +41,6 @@ public class CaffeineLoadCacheComponentConverter
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
answer.add(new ConvertiblePair(String.class,
com.github.benmanes.caffeine.cache.CacheLoader.class));
- answer.add(new ConvertiblePair(String.class, java.lang.Object.class));
answer.add(new ConvertiblePair(String.class,
com.github.benmanes.caffeine.cache.RemovalListener.class));
answer.add(new ConvertiblePair(String.class,
com.github.benmanes.caffeine.cache.stats.StatsCounter.class));
answer.add(new ConvertiblePair(String.class,
org.apache.camel.component.caffeine.CaffeineConfiguration.class));
@@ -62,7 +61,6 @@ public class CaffeineLoadCacheComponentConverter
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
case "com.github.benmanes.caffeine.cache.CacheLoader": return
camelContext.getRegistry().lookupByNameAndType(ref,
com.github.benmanes.caffeine.cache.CacheLoader.class);
- case "java.lang.Object": return
camelContext.getRegistry().lookupByNameAndType(ref, java.lang.Object.class);
case "com.github.benmanes.caffeine.cache.RemovalListener": return
camelContext.getRegistry().lookupByNameAndType(ref,
com.github.benmanes.caffeine.cache.RemovalListener.class);
case "com.github.benmanes.caffeine.cache.stats.StatsCounter":
return camelContext.getRegistry().lookupByNameAndType(ref,
com.github.benmanes.caffeine.cache.stats.StatsCounter.class);
case "org.apache.camel.component.caffeine.CaffeineConfiguration":
return camelContext.getRegistry().lookupByNameAndType(ref,
org.apache.camel.component.caffeine.CaffeineConfiguration.class);
diff --git
a/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentConverter.java
b/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentConverter.java
index f808a54..48779df 100644
---
a/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentConverter.java
+++
b/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentConverter.java
@@ -41,7 +41,6 @@ public class EhcacheComponentConverter
Set<ConvertiblePair> answer = new LinkedHashSet<>();
answer.add(new ConvertiblePair(String.class,
org.ehcache.CacheManager.class));
answer.add(new ConvertiblePair(String.class,
org.ehcache.config.Configuration.class));
- answer.add(new ConvertiblePair(String.class, java.lang.Object.class));
answer.add(new ConvertiblePair(String.class,
org.ehcache.config.CacheConfiguration.class));
return answer;
}
@@ -61,7 +60,6 @@ public class EhcacheComponentConverter
switch (targetType.getName()) {
case "org.ehcache.CacheManager": return
camelContext.getRegistry().lookupByNameAndType(ref,
org.ehcache.CacheManager.class);
case "org.ehcache.config.Configuration": return
camelContext.getRegistry().lookupByNameAndType(ref,
org.ehcache.config.Configuration.class);
- case "java.lang.Object": return
camelContext.getRegistry().lookupByNameAndType(ref, java.lang.Object.class);
case "org.ehcache.config.CacheConfiguration": return
camelContext.getRegistry().lookupByNameAndType(ref,
org.ehcache.config.CacheConfiguration.class);
}
return null;
diff --git
a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/cache/springboot/IgniteCacheComponentConverter.java
b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/cache/springboot/IgniteCacheComponentConverter.java
index a6cccbe..15690fe 100644
---
a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/cache/springboot/IgniteCacheComponentConverter.java
+++
b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/cache/springboot/IgniteCacheComponentConverter.java
@@ -40,7 +40,6 @@ public class IgniteCacheComponentConverter
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
- answer.add(new ConvertiblePair(String.class, java.lang.Object.class));
answer.add(new ConvertiblePair(String.class,
org.apache.ignite.Ignite.class));
answer.add(new ConvertiblePair(String.class,
org.apache.ignite.configuration.IgniteConfiguration.class));
return answer;
@@ -59,7 +58,6 @@ public class IgniteCacheComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "java.lang.Object": return
camelContext.getRegistry().lookupByNameAndType(ref, java.lang.Object.class);
case "org.apache.ignite.Ignite": return
camelContext.getRegistry().lookupByNameAndType(ref,
org.apache.ignite.Ignite.class);
case "org.apache.ignite.configuration.IgniteConfiguration": return
camelContext.getRegistry().lookupByNameAndType(ref,
org.apache.ignite.configuration.IgniteConfiguration.class);
}
diff --git
a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/compute/springboot/IgniteComputeComponentConverter.java
b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/compute/springboot/IgniteComputeComponentConverter.java
index 2278425..5d5faf6 100644
---
a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/compute/springboot/IgniteComputeComponentConverter.java
+++
b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/compute/springboot/IgniteComputeComponentConverter.java
@@ -40,7 +40,6 @@ public class IgniteComputeComponentConverter
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
- answer.add(new ConvertiblePair(String.class, java.lang.Object.class));
answer.add(new ConvertiblePair(String.class,
org.apache.ignite.Ignite.class));
answer.add(new ConvertiblePair(String.class,
org.apache.ignite.configuration.IgniteConfiguration.class));
return answer;
@@ -59,7 +58,6 @@ public class IgniteComputeComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "java.lang.Object": return
camelContext.getRegistry().lookupByNameAndType(ref, java.lang.Object.class);
case "org.apache.ignite.Ignite": return
camelContext.getRegistry().lookupByNameAndType(ref,
org.apache.ignite.Ignite.class);
case "org.apache.ignite.configuration.IgniteConfiguration": return
camelContext.getRegistry().lookupByNameAndType(ref,
org.apache.ignite.configuration.IgniteConfiguration.class);
}
diff --git
a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/events/springboot/IgniteEventsComponentConverter.java
b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/events/springboot/IgniteEventsComponentConverter.java
index 51a3f28..f1708c7 100644
---
a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/events/springboot/IgniteEventsComponentConverter.java
+++
b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/events/springboot/IgniteEventsComponentConverter.java
@@ -40,7 +40,6 @@ public class IgniteEventsComponentConverter
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
- answer.add(new ConvertiblePair(String.class, java.lang.Object.class));
answer.add(new ConvertiblePair(String.class,
org.apache.ignite.Ignite.class));
answer.add(new ConvertiblePair(String.class,
org.apache.ignite.configuration.IgniteConfiguration.class));
return answer;
@@ -59,7 +58,6 @@ public class IgniteEventsComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "java.lang.Object": return
camelContext.getRegistry().lookupByNameAndType(ref, java.lang.Object.class);
case "org.apache.ignite.Ignite": return
camelContext.getRegistry().lookupByNameAndType(ref,
org.apache.ignite.Ignite.class);
case "org.apache.ignite.configuration.IgniteConfiguration": return
camelContext.getRegistry().lookupByNameAndType(ref,
org.apache.ignite.configuration.IgniteConfiguration.class);
}
diff --git
a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/idgen/springboot/IgniteIdGenComponentConverter.java
b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/idgen/springboot/IgniteIdGenComponentConverter.java
index 7efd599..dc7fd00 100644
---
a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/idgen/springboot/IgniteIdGenComponentConverter.java
+++
b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/idgen/springboot/IgniteIdGenComponentConverter.java
@@ -40,7 +40,6 @@ public class IgniteIdGenComponentConverter
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
- answer.add(new ConvertiblePair(String.class, java.lang.Object.class));
answer.add(new ConvertiblePair(String.class,
org.apache.ignite.Ignite.class));
answer.add(new ConvertiblePair(String.class,
org.apache.ignite.configuration.IgniteConfiguration.class));
return answer;
@@ -59,7 +58,6 @@ public class IgniteIdGenComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "java.lang.Object": return
camelContext.getRegistry().lookupByNameAndType(ref, java.lang.Object.class);
case "org.apache.ignite.Ignite": return
camelContext.getRegistry().lookupByNameAndType(ref,
org.apache.ignite.Ignite.class);
case "org.apache.ignite.configuration.IgniteConfiguration": return
camelContext.getRegistry().lookupByNameAndType(ref,
org.apache.ignite.configuration.IgniteConfiguration.class);
}
diff --git
a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/messaging/springboot/IgniteMessagingComponentConverter.java
b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/messaging/springboot/IgniteMessagingComponentConverter.java
index c68f93d..88f5e66 100644
---
a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/messaging/springboot/IgniteMessagingComponentConverter.java
+++
b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/messaging/springboot/IgniteMessagingComponentConverter.java
@@ -40,7 +40,6 @@ public class IgniteMessagingComponentConverter
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
- answer.add(new ConvertiblePair(String.class, java.lang.Object.class));
answer.add(new ConvertiblePair(String.class,
org.apache.ignite.Ignite.class));
answer.add(new ConvertiblePair(String.class,
org.apache.ignite.configuration.IgniteConfiguration.class));
return answer;
@@ -59,7 +58,6 @@ public class IgniteMessagingComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "java.lang.Object": return
camelContext.getRegistry().lookupByNameAndType(ref, java.lang.Object.class);
case "org.apache.ignite.Ignite": return
camelContext.getRegistry().lookupByNameAndType(ref,
org.apache.ignite.Ignite.class);
case "org.apache.ignite.configuration.IgniteConfiguration": return
camelContext.getRegistry().lookupByNameAndType(ref,
org.apache.ignite.configuration.IgniteConfiguration.class);
}
diff --git
a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/queue/springboot/IgniteQueueComponentConverter.java
b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/queue/springboot/IgniteQueueComponentConverter.java
index e40244b..c45e4a2 100644
---
a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/queue/springboot/IgniteQueueComponentConverter.java
+++
b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/queue/springboot/IgniteQueueComponentConverter.java
@@ -40,7 +40,6 @@ public class IgniteQueueComponentConverter
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
- answer.add(new ConvertiblePair(String.class, java.lang.Object.class));
answer.add(new ConvertiblePair(String.class,
org.apache.ignite.Ignite.class));
answer.add(new ConvertiblePair(String.class,
org.apache.ignite.configuration.IgniteConfiguration.class));
return answer;
@@ -59,7 +58,6 @@ public class IgniteQueueComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "java.lang.Object": return
camelContext.getRegistry().lookupByNameAndType(ref, java.lang.Object.class);
case "org.apache.ignite.Ignite": return
camelContext.getRegistry().lookupByNameAndType(ref,
org.apache.ignite.Ignite.class);
case "org.apache.ignite.configuration.IgniteConfiguration": return
camelContext.getRegistry().lookupByNameAndType(ref,
org.apache.ignite.configuration.IgniteConfiguration.class);
}
diff --git
a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/set/springboot/IgniteSetComponentConverter.java
b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/set/springboot/IgniteSetComponentConverter.java
index 1a6f927..6097468 100644
---
a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/set/springboot/IgniteSetComponentConverter.java
+++
b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/set/springboot/IgniteSetComponentConverter.java
@@ -40,7 +40,6 @@ public class IgniteSetComponentConverter
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
- answer.add(new ConvertiblePair(String.class, java.lang.Object.class));
answer.add(new ConvertiblePair(String.class,
org.apache.ignite.Ignite.class));
answer.add(new ConvertiblePair(String.class,
org.apache.ignite.configuration.IgniteConfiguration.class));
return answer;
@@ -59,7 +58,6 @@ public class IgniteSetComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "java.lang.Object": return
camelContext.getRegistry().lookupByNameAndType(ref, java.lang.Object.class);
case "org.apache.ignite.Ignite": return
camelContext.getRegistry().lookupByNameAndType(ref,
org.apache.ignite.Ignite.class);
case "org.apache.ignite.configuration.IgniteConfiguration": return
camelContext.getRegistry().lookupByNameAndType(ref,
org.apache.ignite.configuration.IgniteConfiguration.class);
}
diff --git
a/components-starter/camel-infinispan-starter/src/main/java/org/apache/camel/component/infinispan/springboot/InfinispanComponentConverter.java
b/components-starter/camel-infinispan-starter/src/main/java/org/apache/camel/component/infinispan/springboot/InfinispanComponentConverter.java
index 956e952..1d00dbc 100644
---
a/components-starter/camel-infinispan-starter/src/main/java/org/apache/camel/component/infinispan/springboot/InfinispanComponentConverter.java
+++
b/components-starter/camel-infinispan-starter/src/main/java/org/apache/camel/component/infinispan/springboot/InfinispanComponentConverter.java
@@ -43,7 +43,6 @@ public class InfinispanComponentConverter
answer.add(new ConvertiblePair(String.class,
org.apache.camel.component.infinispan.InfinispanConfiguration.class));
answer.add(new ConvertiblePair(String.class,
org.apache.camel.component.infinispan.InfinispanQueryBuilder.class));
answer.add(new ConvertiblePair(String.class,
org.apache.camel.component.infinispan.InfinispanCustomListener.class));
- answer.add(new ConvertiblePair(String.class, java.lang.Object.class));
answer.add(new ConvertiblePair(String.class,
org.infinispan.commons.api.BasicCacheContainer.class));
answer.add(new ConvertiblePair(String.class,
java.util.function.BiFunction.class));
return answer;
@@ -65,7 +64,6 @@ public class InfinispanComponentConverter
case
"org.apache.camel.component.infinispan.InfinispanConfiguration": return
camelContext.getRegistry().lookupByNameAndType(ref,
org.apache.camel.component.infinispan.InfinispanConfiguration.class);
case
"org.apache.camel.component.infinispan.InfinispanQueryBuilder": return
camelContext.getRegistry().lookupByNameAndType(ref,
org.apache.camel.component.infinispan.InfinispanQueryBuilder.class);
case
"org.apache.camel.component.infinispan.InfinispanCustomListener": return
camelContext.getRegistry().lookupByNameAndType(ref,
org.apache.camel.component.infinispan.InfinispanCustomListener.class);
- case "java.lang.Object": return
camelContext.getRegistry().lookupByNameAndType(ref, java.lang.Object.class);
case "org.infinispan.commons.api.BasicCacheContainer": return
camelContext.getRegistry().lookupByNameAndType(ref,
org.infinispan.commons.api.BasicCacheContainer.class);
case "java.util.function.BiFunction": return
camelContext.getRegistry().lookupByNameAndType(ref,
java.util.function.BiFunction.class);
}
diff --git
a/components-starter/camel-undertow-starter/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentConverter.java
b/components-starter/camel-undertow-starter/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentConverter.java
index d33fe87..ed0198a 100644
---
a/components-starter/camel-undertow-starter/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentConverter.java
+++
b/components-starter/camel-undertow-starter/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentConverter.java
@@ -41,7 +41,6 @@ public class UndertowComponentConverter
Set<ConvertiblePair> answer = new LinkedHashSet<>();
answer.add(new ConvertiblePair(String.class,
org.apache.camel.component.undertow.UndertowHostOptions.class));
answer.add(new ConvertiblePair(String.class,
org.apache.camel.component.undertow.UndertowHttpBinding.class));
- answer.add(new ConvertiblePair(String.class, java.lang.Object.class));
answer.add(new ConvertiblePair(String.class,
org.apache.camel.component.undertow.spi.UndertowSecurityProvider.class));
answer.add(new ConvertiblePair(String.class,
org.apache.camel.support.jsse.SSLContextParameters.class));
return answer;
@@ -62,7 +61,6 @@ public class UndertowComponentConverter
switch (targetType.getName()) {
case "org.apache.camel.component.undertow.UndertowHostOptions":
return camelContext.getRegistry().lookupByNameAndType(ref,
org.apache.camel.component.undertow.UndertowHostOptions.class);
case "org.apache.camel.component.undertow.UndertowHttpBinding":
return camelContext.getRegistry().lookupByNameAndType(ref,
org.apache.camel.component.undertow.UndertowHttpBinding.class);
- case "java.lang.Object": return
camelContext.getRegistry().lookupByNameAndType(ref, java.lang.Object.class);
case
"org.apache.camel.component.undertow.spi.UndertowSecurityProvider": return
camelContext.getRegistry().lookupByNameAndType(ref,
org.apache.camel.component.undertow.spi.UndertowSecurityProvider.class);
case "org.apache.camel.support.jsse.SSLContextParameters": return
camelContext.getRegistry().lookupByNameAndType(ref,
org.apache.camel.support.jsse.SSLContextParameters.class);
}
diff --git
a/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlVerifierComponentConverter.java
b/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlVerifierComponentConverter.java
index f66bb5d..c43f0c9 100644
---
a/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlVerifierComponentConverter.java
+++
b/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlVerifierComponentConverter.java
@@ -41,7 +41,6 @@ public class XmlVerifierComponentConverter
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
answer.add(new ConvertiblePair(String.class,
javax.xml.crypto.KeySelector.class));
- answer.add(new ConvertiblePair(String.class, java.lang.Object.class));
answer.add(new ConvertiblePair(String.class,
org.apache.camel.component.xmlsecurity.api.ValidationFailedHandler.class));
answer.add(new ConvertiblePair(String.class,
org.apache.camel.component.xmlsecurity.api.XmlSignature2Message.class));
answer.add(new ConvertiblePair(String.class,
org.apache.camel.component.xmlsecurity.api.XmlSignatureChecker.class));
@@ -64,7 +63,6 @@ public class XmlVerifierComponentConverter
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
case "javax.xml.crypto.KeySelector": return
camelContext.getRegistry().lookupByNameAndType(ref,
javax.xml.crypto.KeySelector.class);
- case "java.lang.Object": return
camelContext.getRegistry().lookupByNameAndType(ref, java.lang.Object.class);
case
"org.apache.camel.component.xmlsecurity.api.ValidationFailedHandler": return
camelContext.getRegistry().lookupByNameAndType(ref,
org.apache.camel.component.xmlsecurity.api.ValidationFailedHandler.class);
case
"org.apache.camel.component.xmlsecurity.api.XmlSignature2Message": return
camelContext.getRegistry().lookupByNameAndType(ref,
org.apache.camel.component.xmlsecurity.api.XmlSignature2Message.class);
case
"org.apache.camel.component.xmlsecurity.api.XmlSignatureChecker": return
camelContext.getRegistry().lookupByNameAndType(ref,
org.apache.camel.component.xmlsecurity.api.XmlSignatureChecker.class);
diff --git
a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
index 3bb7e56..6b9cae5 100644
---
a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
+++
b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
@@ -787,6 +787,10 @@ public class SpringBootAutoConfigurationMojo extends
AbstractSpringBootGenerator
if (option.getEnums() != null && !option.getEnums().isEmpty()) {
return false;
}
+ // java.lang.Object are not complex
+ if ("java.lang.Object".equals(option.getJavaType())) {
+ return false;
+ }
// all the object types are complex
return "object".equals(option.getType());
}
