You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2020/11/24 12:54:48 UTC
[camel] branch master updated: CAMEL-15888: ConfigurerResolver
should return PropertyConfigurer instead of GeneratedPropertyConfigurer
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
The following commit(s) were added to refs/heads/master by this push:
new 56b753a CAMEL-15888: ConfigurerResolver should return PropertyConfigurer instead of GeneratedPropertyConfigurer
56b753a is described below
commit 56b753a37d1e8defb19371597e48ee5043536bc5
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Tue Nov 24 12:10:26 2020 +0100
CAMEL-15888: ConfigurerResolver should return PropertyConfigurer instead of GeneratedPropertyConfigurer
---
.../main/java/org/apache/camel/spi/ConfigurerResolver.java | 2 +-
.../apache/camel/impl/engine/CamelPostProcessorHelper.java | 4 ++--
.../apache/camel/impl/engine/DefaultConfigurerResolver.java | 13 ++++++-------
.../java/org/apache/camel/impl/ConfigurerResolverTest.java | 4 ++--
4 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/ConfigurerResolver.java b/core/camel-api/src/main/java/org/apache/camel/spi/ConfigurerResolver.java
index 39a763c..0033d33 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/ConfigurerResolver.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/ConfigurerResolver.java
@@ -32,5 +32,5 @@ public interface ConfigurerResolver {
* @param context the camel context
* @return the resolved configurer, or <tt>null</tt> if no configurer could be found
*/
- GeneratedPropertyConfigurer resolvePropertyConfigurer(String name, CamelContext context);
+ PropertyConfigurer resolvePropertyConfigurer(String name, CamelContext context);
}
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
index 701b814..546bb1f 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
@@ -42,8 +42,8 @@ import org.apache.camel.ProxyInstantiationException;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.Service;
import org.apache.camel.spi.BeanProxyFactory;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
import org.apache.camel.spi.PropertiesComponent;
+import org.apache.camel.spi.PropertyConfigurer;
import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.support.PropertyBindingSupport;
import org.apache.camel.support.service.ServiceHelper;
@@ -383,7 +383,7 @@ public class CamelPostProcessorHelper implements CamelContextAware {
// lookup configurer if there is any
// use FQN class name first, then simple name, and root key last
- GeneratedPropertyConfigurer configurer = null;
+ PropertyConfigurer configurer = null;
String[] names = new String[] {
type.getName() + "-configurer", type.getSimpleName() + "-configurer", rootKey + "-configurer" };
for (String n : names) {
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultConfigurerResolver.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultConfigurerResolver.java
index 8b774f2..a22317a 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultConfigurerResolver.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultConfigurerResolver.java
@@ -23,7 +23,7 @@ import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.NoFactoryAvailableException;
import org.apache.camel.spi.ConfigurerResolver;
import org.apache.camel.spi.FactoryFinder;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
+import org.apache.camel.spi.PropertyConfigurer;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,14 +46,13 @@ public class DefaultConfigurerResolver implements ConfigurerResolver {
}
@Override
- public GeneratedPropertyConfigurer resolvePropertyConfigurer(String name, CamelContext context) {
+ public PropertyConfigurer resolvePropertyConfigurer(String name, CamelContext context) {
if (ObjectHelper.isEmpty(name)) {
return null;
}
// lookup in registry first
- GeneratedPropertyConfigurer configurer
- = context.getRegistry().lookupByNameAndType(name, GeneratedPropertyConfigurer.class);
+ PropertyConfigurer configurer = context.getRegistry().lookupByNameAndType(name, PropertyConfigurer.class);
if (configurer != null) {
return configurer;
}
@@ -89,11 +88,11 @@ public class DefaultConfigurerResolver implements ConfigurerResolver {
}
// create the component
- if (GeneratedPropertyConfigurer.class.isAssignableFrom(type)) {
- return (GeneratedPropertyConfigurer) context.getInjector().newInstance(type, false);
+ if (PropertyConfigurer.class.isAssignableFrom(type)) {
+ return (PropertyConfigurer) context.getInjector().newInstance(type, false);
} else {
throw new IllegalArgumentException(
- "Type is not a GeneratedPropertyConfigurer implementation. Found: " + type.getName());
+ "Type is not a PropertyConfigurer implementation. Found: " + type.getName());
}
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/ConfigurerResolverTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/ConfigurerResolverTest.java
index dd20ff6..7ea998a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/ConfigurerResolverTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/ConfigurerResolverTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.impl;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.ExtendedCamelContext;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
+import org.apache.camel.spi.PropertyConfigurer;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -26,7 +26,7 @@ public class ConfigurerResolverTest extends ContextTestSupport {
@Test
public void testConfigurerResolver() throws Exception {
- GeneratedPropertyConfigurer resolver = context.adapt(ExtendedCamelContext.class).getConfigurerResolver()
+ PropertyConfigurer resolver = context.adapt(ExtendedCamelContext.class).getConfigurerResolver()
.resolvePropertyConfigurer(context.getClass().getName(), context);
Assertions.assertNotNull(resolver);