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 2013/01/23 16:26:11 UTC
svn commit: r1437464 [1/3] - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/component/bean/
camel-core/src/main/java/org/apache/camel/component/properties/
camel-core/src/main/java/org/apac...
Author: davsclaus
Date: Wed Jan 23 15:26:07 2013
New Revision: 1437464
URL: http://svn.apache.org/viewvc?rev=1437464&view=rev
Log:
CAMEL-5997: Registry API changes to accomodate CDI. Old API has been @deprecated to be backwards compatible.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesResolver.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CompositeRegistry.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultDataFormatResolver.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/PropertyPlaceholderDelegateRegistry.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/SimpleRegistry.java
camel/trunk/camel-core/src/main/java/org/apache/camel/main/Main.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Registry.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/DefaultParameterMappingStrategyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentRegistryTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFromHeaderOverrideEndpointUriTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/RegistryLookupTypeClassCastExceptionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/RegistryTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/RoutePolicyRefCallbackTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/SimpleRegistryTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/language/BeanTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/main/MainTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/model/LoadRouteFromXmlWithPolicyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanRouteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DefinitionPolicyPerProcessorTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PolicyPerProcessorTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PolicyPerRouteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateForceCompletionOnStopTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointPolicyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipDataModificationTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipWithExceptionTest.java
camel/trunk/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentSpringTest.java
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ses/SesComponentSpringTest.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintComponentResolver.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintDataFormatResolver.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintLanguageResolver.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiBeanRegistry.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiComponentResolver.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDataFormatResolver.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiLanguageResolver.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java
camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/ServiceRegistryTest.java
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
camel/trunk/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureConfiguration.java
camel/trunk/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java
camel/trunk/components/camel-ejb/src/main/java/org/apache/camel/component/ejb/EjbRegistryBean.java
camel/trunk/components/camel-ejb/src/test/java/org/apache/camel/component/ejb/SpringGreaterCamelEjbTest.java
camel/trunk/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceConsumer.java
camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/config/JmsEndpointWithCustomDestinationTest.java
camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaComponent.java
camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteEndpointTest.java
camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/BeanWithJXPathInjectionTest.java
camel/trunk/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapProducer.java
camel/trunk/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjSpringTest.java
camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java
camel/trunk/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchComponent.java
camel/trunk/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/CamelProxyFactoryBean.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/ApplicationContextRegistry.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerInlinedPropertiesPlaceholderTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerPropertiesPlaceholderTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/aop/SpringAopClassLevelCamelBeanTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateHasTwoTemplatesTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateMaximumCacheSizeTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterBeanIdExistsTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTwoCamelContextsTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateHasTwoTemplatesTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateMaximumCacheSizeTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateMixedAutoRegisterTwoCamelContextsTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextDependsOnTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextNoDependsOnTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringProduceInjectedPrototypeBeanTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringProduceInjectedSingletonBeanTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ProduceSplitMethodCallIssueTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/RedeliveryErrorHandlerTwoXmlFilesIssueTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringInitializationIssueTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/CamelCustomPostProcessorOnRouteBuilderTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringScheduledThreadPoolTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterWithCustomThreadPoolExecutorTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentLoadStoreTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentTest.java
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateStoreAsText.java
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/CustomizedJdbcMessageIdRepositoryTest.java
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/JdbcMessageIdRepositoryTest.java
camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/CamelEndpointInjectTest.java
camel/trunk/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/AsyncEndpointTransacted2Test.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/AsyncEndpointTransactedTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/LoggingPipelineTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/PartiallyTransactedPipelineTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedExceptionClauseAfterTransactedTagTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedFullExampleTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedOnCompletionTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedOnExceptionTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedPipelineTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ibatis/TransactedTryCatchTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/BeanCallDerivedClassTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/proxy/SpringEchoCamelProxyTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java Wed Jan 23 15:26:07 2013
@@ -459,7 +459,7 @@ public class DefaultErrorHandlerBuilder
if (executorService == null || executorService.isShutdown()) {
// camel context will shutdown the executor when it shutdown so no need to shut it down when stopping
if (executorServiceRef != null) {
- executorService = camelContext.getRegistry().lookup(executorServiceRef, ScheduledExecutorService.class);
+ executorService = camelContext.getRegistry().lookupByNameAndType(executorServiceRef, ScheduledExecutorService.class);
if (executorService == null) {
ExecutorServiceManager manager = camelContext.getExecutorServiceManager();
ThreadPoolProfile profile = manager.getThreadPoolProfile(executorServiceRef);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java Wed Jan 23 15:26:07 2013
@@ -135,7 +135,7 @@ public class ErrorHandlerBuilderRef exte
ErrorHandlerBuilderRef other = (ErrorHandlerBuilderRef) answer;
String otherRef = other.getRef();
if (isErrorHandlerBuilderConfigured(otherRef)) {
- answer = camelContext.getRegistry().lookup(otherRef, ErrorHandlerBuilder.class);
+ answer = camelContext.getRegistry().lookupByNameAndType(otherRef, ErrorHandlerBuilder.class);
if (answer == null) {
throw new IllegalArgumentException("ErrorHandlerBuilder with id " + otherRef + " not found in registry.");
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java Wed Jan 23 15:26:07 2013
@@ -416,7 +416,7 @@ public final class ExpressionBuilder {
public static Expression refExpression(final String ref) {
return new ExpressionAdapter() {
public Object evaluate(Exchange exchange) {
- return exchange.getContext().getRegistry().lookup(ref);
+ return exchange.getContext().getRegistry().lookupByName(ref);
}
@Override
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java Wed Jan 23 15:26:07 2013
@@ -146,7 +146,7 @@ public class BeanInfo {
public static ParameterMappingStrategy createParameterMappingStrategy(CamelContext camelContext) {
// lookup in registry first if there is a user define strategy
Registry registry = camelContext.getRegistry();
- ParameterMappingStrategy answer = registry.lookup(BeanConstants.BEAN_PARAMETER_MAPPING_STRATEGY, ParameterMappingStrategy.class);
+ ParameterMappingStrategy answer = registry.lookupByNameAndType(BeanConstants.BEAN_PARAMETER_MAPPING_STRATEGY, ParameterMappingStrategy.class);
if (answer == null) {
// no then use the default one
answer = new DefaultParameterMappingStrategy();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java Wed Jan 23 15:26:07 2013
@@ -133,6 +133,6 @@ public class RegistryBean implements Bea
}
protected Object lookupBean() {
- return registry.lookup(name);
+ return registry.lookupByName(name);
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesResolver.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesResolver.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesResolver.java Wed Jan 23 15:26:07 2013
@@ -109,7 +109,7 @@ public class DefaultPropertiesResolver i
if (path.startsWith("ref:")) {
path = ObjectHelper.after(path, "ref:");
}
- Properties answer = context.getRegistry().lookup(path, Properties.class);
+ Properties answer = context.getRegistry().lookupByNameAndType(path, Properties.class);
if (answer == null && (!ignoreMissingLocation)) {
throw new FileNotFoundException("Properties " + path + " not found in registry");
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CompositeRegistry.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CompositeRegistry.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CompositeRegistry.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CompositeRegistry.java Wed Jan 23 15:26:07 2013
@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.apache.camel.NoSuchBeanException;
import org.apache.camel.spi.Registry;
@@ -42,11 +43,11 @@ public class CompositeRegistry implement
registryList.add(registry);
}
- public <T> T lookup(String name, Class<T> type) {
+ public <T> T lookupByNameAndType(String name, Class<T> type) {
T answer = null;
for (Registry registry : registryList) {
try {
- answer = registry.lookup(name, type);
+ answer = registry.lookupByNameAndType(name, type);
if (answer != null) {
break;
}
@@ -62,10 +63,10 @@ public class CompositeRegistry implement
return answer;
}
- public Object lookup(String name) {
+ public Object lookupByName(String name) {
Object answer = null;
for (Registry registry : registryList) {
- answer = registry.lookup(name);
+ answer = registry.lookupByName(name);
if (answer != null) {
break;
}
@@ -73,10 +74,10 @@ public class CompositeRegistry implement
return answer;
}
- public <T> Map<String, T> lookupByType(Class<T> type) {
- Map<String, T> answer = Collections.<String, T>emptyMap();
+ public <T> Map<String, T> findByTypeWithName(Class<T> type) {
+ Map<String, T> answer = Collections.emptyMap();
for (Registry registry : registryList) {
- answer = registry.lookupByType(type);
+ answer = registry.findByTypeWithName(type);
if (!answer.isEmpty()) {
break;
}
@@ -84,4 +85,26 @@ public class CompositeRegistry implement
return answer;
}
+ public <T> Set<T> findByType(Class<T> type) {
+ Set<T> answer = Collections.emptySet();
+ for (Registry registry : registryList) {
+ answer = registry.findByType(type);
+ if (!answer.isEmpty()) {
+ break;
+ }
+ }
+ return answer;
+ }
+
+ public Object lookup(String name) {
+ return lookupByName(name);
+ }
+
+ public <T> T lookup(String name, Class<T> type) {
+ return lookupByNameAndType(name, type);
+ }
+
+ public <T> Map<String, T> lookupByType(Class<T> type) {
+ return findByTypeWithName(type);
+ }
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Wed Jan 23 15:26:07 2013
@@ -1574,7 +1574,7 @@ public class DefaultCamelContext extends
Component existing = hasComponent("properties");
if (existing == null) {
// no existing properties component so lookup and add as component if possible
- propertiesComponent = getRegistry().lookup("properties", PropertiesComponent.class);
+ propertiesComponent = getRegistry().lookupByNameAndType("properties", PropertiesComponent.class);
if (propertiesComponent != null) {
addComponent("properties", propertiesComponent);
}
@@ -2207,7 +2207,7 @@ public class DefaultCamelContext extends
* @return the newly created endpoint or null if it could not be resolved
*/
protected Endpoint createEndpoint(String uri) {
- Object value = getRegistry().lookup(uri);
+ Object value = getRegistry().lookupByName(uri);
if (value instanceof Endpoint) {
return (Endpoint) value;
} else if (value instanceof Processor) {
@@ -2443,7 +2443,7 @@ public class DefaultCamelContext extends
private static <T> T lookup(CamelContext context, String ref, Class<T> type) {
try {
- return context.getRegistry().lookup(ref, type);
+ return context.getRegistry().lookupByNameAndType(ref, type);
} catch (Exception e) {
// need to ignore not same type and return it as null
return null;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java Wed Jan 23 15:26:07 2013
@@ -45,7 +45,7 @@ public class DefaultComponentResolver im
// lookup in registry first
Object bean = null;
try {
- bean = context.getRegistry().lookup(name);
+ bean = context.getRegistry().lookupByName(name);
getLog().debug("Found component: {} in registry: {}", name, bean);
} catch (Exception e) {
getLog().debug("Ignored error looking up bean: " + name, e);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultDataFormatResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultDataFormatResolver.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultDataFormatResolver.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultDataFormatResolver.java Wed Jan 23 15:26:07 2013
@@ -66,7 +66,7 @@ public class DefaultDataFormatResolver i
private static <T> T lookup(CamelContext context, String ref, Class<T> type) {
try {
- return context.getRegistry().lookup(ref, type);
+ return context.getRegistry().lookupByNameAndType(ref, type);
} catch (Exception e) {
// need to ignore not same type and return it as null
return null;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceStrategy.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceStrategy.java Wed Jan 23 15:26:07 2013
@@ -72,7 +72,7 @@ public class DefaultExecutorServiceStrat
}
public ExecutorService lookup(Object source, String name, String executorServiceRef) {
- ExecutorService answer = camelContext.getRegistry().lookup(executorServiceRef, ExecutorService.class);
+ ExecutorService answer = camelContext.getRegistry().lookupByNameAndType(executorServiceRef, ExecutorService.class);
if (answer == null) {
// try to see if we got a thread pool profile with that id
answer = newThreadPool(source, name, executorServiceRef);
@@ -81,7 +81,7 @@ public class DefaultExecutorServiceStrat
}
public ScheduledExecutorService lookupScheduled(Object source, String name, String executorServiceRef) {
- ScheduledExecutorService answer = camelContext.getRegistry().lookup(executorServiceRef, ScheduledExecutorService.class);
+ ScheduledExecutorService answer = camelContext.getRegistry().lookupByNameAndType(executorServiceRef, ScheduledExecutorService.class);
if (answer == null) {
ThreadPoolProfile profile = getThreadPoolProfile(executorServiceRef);
if (profile != null) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java Wed Jan 23 15:26:07 2013
@@ -44,7 +44,7 @@ public class DefaultLanguageResolver imp
// lookup in registry first
Object bean = null;
try {
- bean = context.getRegistry().lookup(name);
+ bean = context.getRegistry().lookupByName(name);
if (bean != null) {
getLog().debug("Found language: {} in registry: {}", name, bean);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java Wed Jan 23 15:26:07 2013
@@ -134,11 +134,11 @@ public class DefaultRouteContext impleme
}
public <T> T lookup(String name, Class<T> type) {
- return getCamelContext().getRegistry().lookup(name, type);
+ return getCamelContext().getRegistry().lookupByNameAndType(name, type);
}
public <T> Map<String, T> lookupByType(Class<T> type) {
- return getCamelContext().getRegistry().lookupByType(type);
+ return getCamelContext().getRegistry().findByTypeWithName(type);
}
@Override
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java Wed Jan 23 15:26:07 2013
@@ -19,6 +19,7 @@ package org.apache.camel.impl;
import java.util.Collections;
import java.util.Hashtable;
import java.util.Map;
+import java.util.Set;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NameNotFoundException;
@@ -43,8 +44,8 @@ public class JndiRegistry implements Reg
this.context = context;
}
- public <T> T lookup(String name, Class<T> type) {
- Object answer = lookup(name);
+ public <T> T lookupByNameAndType(String name, Class<T> type) {
+ Object answer = lookupByName(name);
// just to be safe
if (answer == null) {
@@ -60,7 +61,7 @@ public class JndiRegistry implements Reg
}
}
- public Object lookup(String name) {
+ public Object lookupByName(String name) {
try {
return getContext().lookup(name);
} catch (NameNotFoundException e) {
@@ -70,11 +71,28 @@ public class JndiRegistry implements Reg
}
}
- public <T> Map<String, T> lookupByType(Class<T> type) {
+ public <T> Map<String, T> findByTypeWithName(Class<T> type) {
// not implemented so we return an empty map
return Collections.emptyMap();
}
+ public <T> Set<T> findByType(Class<T> type) {
+ // not implemented so we return an empty set
+ return Collections.emptySet();
+ }
+
+ public Object lookup(String name) {
+ return lookupByName(name);
+ }
+
+ public <T> T lookup(String name, Class<T> type) {
+ return lookupByNameAndType(name, type);
+ }
+
+ public <T> Map<String, T> lookupByType(Class<T> type) {
+ return findByTypeWithName(type);
+ }
+
public void bind(String s, Object o) {
try {
getContext().bind(s, o);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/PropertyPlaceholderDelegateRegistry.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/PropertyPlaceholderDelegateRegistry.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/PropertyPlaceholderDelegateRegistry.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/PropertyPlaceholderDelegateRegistry.java Wed Jan 23 15:26:07 2013
@@ -17,6 +17,7 @@
package org.apache.camel.impl;
import java.util.Map;
+import java.util.Set;
import org.apache.camel.CamelContext;
import org.apache.camel.spi.Registry;
@@ -39,34 +40,50 @@ public class PropertyPlaceholderDelegate
this.delegate = delegate;
}
- public Object lookup(String name) {
+ public Object lookupByName(String name) {
try {
// Must avoid attempting placeholder resolution when looking up
// the properties component or else we end up in an infinite loop.
if (!name.equals("properties")) {
name = context.resolvePropertyPlaceholders(name);
}
- return delegate.lookup(name);
+ return delegate.lookupByName(name);
} catch (Exception e) {
throw ObjectHelper.wrapRuntimeCamelException(e);
}
}
- public <T> T lookup(String name, Class<T> type) {
+ public <T> T lookupByNameAndType(String name, Class<T> type) {
try {
// Must avoid attempting placeholder resolution when looking up
// the properties component or else we end up in an infinite loop.
if (!name.equals("properties")) {
name = context.resolvePropertyPlaceholders(name);
}
- return delegate.lookup(name, type);
+ return delegate.lookupByNameAndType(name, type);
} catch (Exception e) {
throw ObjectHelper.wrapRuntimeCamelException(e);
}
}
+ public <T> Map<String, T> findByTypeWithName(Class<T> type) {
+ return delegate.findByTypeWithName(type);
+ }
+
+ public <T> Set<T> findByType(Class<T> type) {
+ return delegate.findByType(type);
+ }
+
+ public Object lookup(String name) {
+ return lookupByName(name);
+ }
+
+ public <T> T lookup(String name, Class<T> type) {
+ return lookupByNameAndType(name, type);
+ }
+
public <T> Map<String, T> lookupByType(Class<T> type) {
- return delegate.lookupByType(type);
+ return findByTypeWithName(type);
}
public Registry getRegistry() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/SimpleRegistry.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/SimpleRegistry.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/SimpleRegistry.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/SimpleRegistry.java Wed Jan 23 15:26:07 2013
@@ -17,7 +17,9 @@
package org.apache.camel.impl;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
+import java.util.Set;
import org.apache.camel.NoSuchBeanException;
import org.apache.camel.spi.Registry;
@@ -29,12 +31,12 @@ public class SimpleRegistry extends Hash
private static final long serialVersionUID = -3739035212761568984L;
- public Object lookup(String name) {
+ public Object lookupByName(String name) {
return get(name);
}
- public <T> T lookup(String name, Class<T> type) {
- Object answer = lookup(name);
+ public <T> T lookupByNameAndType(String name, Class<T> type) {
+ Object answer = lookupByName(name);
// just to be safe
if (answer == null) {
@@ -50,7 +52,7 @@ public class SimpleRegistry extends Hash
}
}
- public <T> Map<String, T> lookupByType(Class<T> type) {
+ public <T> Map<String, T> findByTypeWithName(Class<T> type) {
Map<String, T> result = new HashMap<String, T>();
for (Map.Entry<String, Object> entry : entrySet()) {
if (type.isInstance(entry.getValue())) {
@@ -59,5 +61,26 @@ public class SimpleRegistry extends Hash
}
return result;
}
-
+
+ public <T> Set<T> findByType(Class<T> type) {
+ Set<T> result = new HashSet<T>();
+ for (Map.Entry<String, Object> entry : entrySet()) {
+ if (type.isInstance(entry.getValue())) {
+ result.add(type.cast(entry.getValue()));
+ }
+ }
+ return result;
+ }
+
+ public Object lookup(String name) {
+ return lookupByName(name);
+ }
+
+ public <T> T lookup(String name, Class<T> type) {
+ return lookupByNameAndType(name, type);
+ }
+
+ public <T> Map<String, T> lookupByType(Class<T> type) {
+ return findByTypeWithName(type);
+ }
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/main/Main.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/main/Main.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/main/Main.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/main/Main.java Wed Jan 23 15:26:07 2013
@@ -72,7 +72,7 @@ public class Main extends MainSupport {
* Using the given <code>name</code> does lookup for the bean being already
* bound using the {@link #bind(String, Object)} method.
*
- * @see Registry#lookup(String)
+ * @see Registry#lookupByName(String)
*/
public Object lookup(String name) {
return registry.get(name);
@@ -83,20 +83,20 @@ public class Main extends MainSupport {
* the bean being already bound using the {@link #bind(String, Object)}
* method.
*
- * @see Registry#lookup(String, Class)
+ * @see Registry#lookupByNameAndType(String, Class)
*/
public <T> T lookup(String name, Class<T> type) {
- return registry.lookup(name, type);
+ return registry.lookupByNameAndType(name, type);
}
/**
* Using the given <code>type</code> does lookup for the bean being already
* bound using the {@link #bind(String, Object)} method.
*
- * @see Registry#lookupByType(Class)
+ * @see Registry#findByTypeWithName(Class)
*/
public <T> Map<String, T> lookupByType(Class<T> type) {
- return registry.lookupByType(type);
+ return registry.findByTypeWithName(type);
}
// Implementation methods
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java Wed Jan 23 15:26:07 2013
@@ -179,7 +179,7 @@ public class AggregateDefinition extends
ScheduledExecutorService timeoutThreadPool = timeoutCheckerExecutorService;
if (timeoutThreadPool == null && timeoutCheckerExecutorServiceRef != null) {
// lookup existing thread pool
- timeoutThreadPool = routeContext.getCamelContext().getRegistry().lookup(timeoutCheckerExecutorServiceRef, ScheduledExecutorService.class);
+ timeoutThreadPool = routeContext.getCamelContext().getRegistry().lookupByNameAndType(timeoutCheckerExecutorServiceRef, ScheduledExecutorService.class);
if (timeoutThreadPool == null) {
// then create a thread pool assuming the ref is a thread pool profile id
timeoutThreadPool = routeContext.getCamelContext().getExecutorServiceManager().newScheduledThreadPool(this,
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java Wed Jan 23 15:26:07 2013
@@ -268,7 +268,7 @@ public final class ProcessorDefinitionHe
// no there is a custom thread pool configured
return false;
} else if (definition.getExecutorServiceRef() != null) {
- ExecutorService answer = routeContext.getCamelContext().getRegistry().lookup(definition.getExecutorServiceRef(), ExecutorService.class);
+ ExecutorService answer = routeContext.getCamelContext().getRegistry().lookupByNameAndType(definition.getExecutorServiceRef(), ExecutorService.class);
// if no existing thread pool, then we will have to create a new thread pool
return answer == null;
} else if (useDefault) {
@@ -303,7 +303,7 @@ public final class ProcessorDefinitionHe
ObjectHelper.notNull(executorServiceRef, "executorServiceRef");
// lookup in registry first and use existing thread pool if exists
- ExecutorService answer = routeContext.getCamelContext().getRegistry().lookup(executorServiceRef, ExecutorService.class);
+ ExecutorService answer = routeContext.getCamelContext().getRegistry().lookupByNameAndType(executorServiceRef, ExecutorService.class);
if (answer == null) {
// then create a thread pool assuming the ref is a thread pool profile id
answer = manager.newThreadPool(source, name, executorServiceRef);
@@ -380,7 +380,7 @@ public final class ProcessorDefinitionHe
ObjectHelper.notNull(executorServiceRef, "executorServiceRef");
// lookup in registry first and use existing thread pool if exists
- ScheduledExecutorService answer = routeContext.getCamelContext().getRegistry().lookup(executorServiceRef, ScheduledExecutorService.class);
+ ScheduledExecutorService answer = routeContext.getCamelContext().getRegistry().lookupByNameAndType(executorServiceRef, ScheduledExecutorService.class);
if (answer == null) {
// then create a thread pool assuming the ref is a thread pool profile id
answer = manager.newScheduledThreadPool(source, name, executorServiceRef);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java Wed Jan 23 15:26:07 2013
@@ -74,7 +74,7 @@ public class SortDefinition<T> extends N
public Processor createProcessor(RouteContext routeContext) throws Exception {
// lookup in registry
if (ObjectHelper.isNotEmpty(comparatorRef)) {
- comparator = routeContext.getCamelContext().getRegistry().lookup(comparatorRef, Comparator.class);
+ comparator = routeContext.getCamelContext().getRegistry().lookupByNameAndType(comparatorRef, Comparator.class);
}
// if no comparator then default on to string representation
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java Wed Jan 23 15:26:07 2013
@@ -64,7 +64,7 @@ public class ThrowExceptionDefinition ex
@Override
public Processor createProcessor(RouteContext routeContext) {
if (ref != null && exception == null) {
- this.exception = routeContext.getCamelContext().getRegistry().lookup(ref, Exception.class);
+ this.exception = routeContext.getCamelContext().getRegistry().lookupByNameAndType(ref, Exception.class);
}
ObjectHelper.notNull(exception, "exception or ref", this);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java Wed Jan 23 15:26:07 2013
@@ -210,7 +210,7 @@ public class XPathExpression extends Nam
// Validate the factory class
if (ObjectHelper.isNotEmpty(factoryRef)) {
- xpathFactory = camelContext.getRegistry().lookup(factoryRef, XPathFactory.class);
+ xpathFactory = camelContext.getRegistry().lookupByNameAndType(factoryRef, XPathFactory.class);
if (xpathFactory == null) {
throw new IllegalArgumentException("The provided XPath Factory is invalid; either it cannot be resolved or it is not an XPathFactory instance");
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java Wed Jan 23 15:26:07 2013
@@ -256,7 +256,7 @@ public class DefaultChannel extends Serv
if (tracer == null) {
if (camelContext.getRegistry() != null) {
// lookup in registry
- Map<String, Tracer> map = camelContext.getRegistry().lookupByType(Tracer.class);
+ Map<String, Tracer> map = camelContext.getRegistry().findByTypeWithName(Tracer.class);
if (map.size() == 1) {
tracer = map.values().iterator().next();
}
@@ -266,7 +266,7 @@ public class DefaultChannel extends Serv
tracer = camelContext.getDefaultTracer();
// configure and use any trace formatter if any exists
- Map<String, TraceFormatter> formatters = camelContext.getRegistry().lookupByType(TraceFormatter.class);
+ Map<String, TraceFormatter> formatters = camelContext.getRegistry().findByTypeWithName(TraceFormatter.class);
if (formatters.size() == 1) {
TraceFormatter formatter = formatters.values().iterator().next();
if (tracer instanceof Tracer) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java Wed Jan 23 15:26:07 2013
@@ -72,7 +72,7 @@ public class Tracer implements Intercept
public static Tracer createTracer(CamelContext context) {
Tracer tracer = new Tracer();
// lets see if we have a formatter if so use it
- TraceFormatter formatter = context.getRegistry().lookup("traceFormatter", TraceFormatter.class);
+ TraceFormatter formatter = context.getRegistry().lookupByNameAndType("traceFormatter", TraceFormatter.class);
if (formatter != null) {
tracer.setFormatter(formatter);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Registry.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Registry.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Registry.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Registry.java Wed Jan 23 15:26:07 2013
@@ -17,6 +17,7 @@
package org.apache.camel.spi;
import java.util.Map;
+import java.util.Set;
/**
* Represents a service registry which may be implemented via a Spring ApplicationContext,
@@ -33,6 +34,48 @@ public interface Registry {
* @param name the name of the service
* @return the service from the registry or <tt>null</tt> if it could not be found
*/
+ Object lookupByName(String name);
+
+ /**
+ * Looks up a service in the registry, returning the service or <tt>null</tt> if it could not be found.
+ *
+ * @param name the name of the service
+ * @param type the type of the required service
+ * @return the service from the registry or <tt>null</tt> if it could not be found
+ */
+ <T> T lookupByNameAndType(String name, Class<T> type);
+
+ /**
+ * Finds services in the registry by their type.
+ * <p/>
+ * <b>Note:</b> Not all registry implementations support this feature,
+ * such as the {@link org.apache.camel.impl.JndiRegistry}.
+ *
+ * @param type the type of the registered services
+ * @return the types found, with their ids as the key. Returns an empty Map if none found.
+ */
+ <T> Map<String, T> findByTypeWithName(Class<T> type);
+
+ /**
+ * Finds services in the registry by their type.
+ * <p/>
+ * <b>Note:</b> Not all registry implementations support this feature,
+ * such as the {@link org.apache.camel.impl.JndiRegistry}.
+ *
+ * @param type the type of the registered services
+ * @return the types found. Returns an empty Set if none found.
+ */
+ <T> Set<T> findByType(Class<T> type);
+
+ /**
+ * Looks up a service in the registry based purely on name,
+ * returning the service or <tt>null</tt> if it could not be found.
+ *
+ * @param name the name of the service
+ * @return the service from the registry or <tt>null</tt> if it could not be found
+ * @deprecated use {@link #lookupByName(String)}
+ */
+ @Deprecated
Object lookup(String name);
/**
@@ -41,7 +84,9 @@ public interface Registry {
* @param name the name of the service
* @param type the type of the required service
* @return the service from the registry or <tt>null</tt> if it could not be found
+ * @deprecated use {@link #lookupByNameAndType(String, Class)}
*/
+ @Deprecated
<T> T lookup(String name, Class<T> type);
/**
@@ -52,7 +97,9 @@ public interface Registry {
*
* @param type the type of the registered services
* @return the types found, with their id as the key. Returns an empty Map if none found.
+ * @deprecated use {@link #findByTypeWithName(Class)}
*/
+ @Deprecated
<T> Map<String, T> lookupByType(Class<T> type);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java Wed Jan 23 15:26:07 2013
@@ -108,7 +108,7 @@ public final class CamelContextHelper {
* {@link CamelContext}
*/
public static Object lookup(CamelContext context, String name) {
- return context.getRegistry().lookup(name);
+ return context.getRegistry().lookupByName(name);
}
/**
@@ -116,7 +116,7 @@ public final class CamelContextHelper {
* {@link CamelContext}
*/
public static <T> T lookup(CamelContext context, String name, Class<T> beanType) {
- return context.getRegistry().lookup(name, beanType);
+ return context.getRegistry().lookupByNameAndType(name, beanType);
}
/**
@@ -374,7 +374,7 @@ public final class CamelContextHelper {
}
// lets see what other components are in the registry
- Map<String, Component> beanMap = camelContext.getRegistry().lookupByType(Component.class);
+ Map<String, Component> beanMap = camelContext.getRegistry().findByTypeWithName(Component.class);
Set<Map.Entry<String, Component>> entries = beanMap.entrySet();
for (Map.Entry<String, Component> entry : entries) {
String name = entry.getKey();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java Wed Jan 23 15:26:07 2013
@@ -408,7 +408,7 @@ public final class EndpointHelper {
return null;
}
- Map<String, Endpoint> map = endpoint.getCamelContext().getRegistry().lookupByType(Endpoint.class);
+ Map<String, Endpoint> map = endpoint.getCamelContext().getRegistry().findByTypeWithName(Endpoint.class);
for (Map.Entry<String, Endpoint> entry : map.entrySet()) {
if (entry.getValue().equals(endpoint)) {
return entry.getKey();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java Wed Jan 23 15:26:07 2013
@@ -479,7 +479,7 @@ public final class ExchangeHelper {
* @return the bean, or <tt>null</tt> if no bean could be found
*/
public static Object lookupBean(Exchange exchange, String name) {
- return exchange.getContext().getRegistry().lookup(name);
+ return exchange.getContext().getRegistry().lookupByName(name);
}
/**
@@ -491,7 +491,7 @@ public final class ExchangeHelper {
* @return the bean, or <tt>null</tt> if no bean could be found
*/
public static <T> T lookupBean(Exchange exchange, String name, Class<T> type) {
- return exchange.getContext().getRegistry().lookup(name, type);
+ return exchange.getContext().getRegistry().lookupByNameAndType(name, type);
}
/**
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/DefaultParameterMappingStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/DefaultParameterMappingStrategyTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/DefaultParameterMappingStrategyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/DefaultParameterMappingStrategyTest.java Wed Jan 23 15:26:07 2013
@@ -135,7 +135,7 @@ public class DefaultParameterMappingStra
public String withRegistry(String body, Registry registry) {
assertNotNull(body);
assertNotNull(registry);
- assertNotNull(registry.lookup("foo"));
+ assertNotNull(registry.lookupByName("foo"));
assertEquals("Hello", body);
return "Registry";
}
@@ -143,7 +143,7 @@ public class DefaultParameterMappingStra
public String withCamelContext(String body, CamelContext camel) {
assertNotNull(body);
assertNotNull(camel);
- assertNotNull(camel.getRegistry().lookup("foo"));
+ assertNotNull(camel.getRegistry().lookupByName("foo"));
assertEquals("Hello", body);
return "CamelContext";
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentRegistryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentRegistryTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentRegistryTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentRegistryTest.java Wed Jan 23 15:26:07 2013
@@ -62,19 +62,19 @@ public class PropertiesComponentRegistry
public void testPropertiesComponentRegistryPlain() throws Exception {
context.start();
- assertSame(foo, context.getRegistry().lookup("foo"));
- assertSame(bar, context.getRegistry().lookup("bar"));
- assertNull(context.getRegistry().lookup("unknown"));
+ assertSame(foo, context.getRegistry().lookupByName("foo"));
+ assertSame(bar, context.getRegistry().lookupByName("bar"));
+ assertNull(context.getRegistry().lookupByName("unknown"));
}
public void testPropertiesComponentRegistryLookupName() throws Exception {
context.start();
- assertSame(foo, context.getRegistry().lookup("{{bean.foo}}"));
- assertSame(bar, context.getRegistry().lookup("{{bean.bar}}"));
+ assertSame(foo, context.getRegistry().lookupByName("{{bean.foo}}"));
+ assertSame(bar, context.getRegistry().lookupByName("{{bean.bar}}"));
try {
- context.getRegistry().lookup("{{bean.unknown}}");
+ context.getRegistry().lookupByName("{{bean.unknown}}");
fail("Should have thrown exception");
} catch (RuntimeCamelException e) {
IllegalArgumentException cause = assertIsInstanceOf(IllegalArgumentException.class, e.getCause());
@@ -85,11 +85,11 @@ public class PropertiesComponentRegistry
public void testPropertiesComponentRegistryLookupNameAndType() throws Exception {
context.start();
- assertSame(foo, context.getRegistry().lookup("{{bean.foo}}", MyFooBean.class));
- assertSame(bar, context.getRegistry().lookup("{{bean.bar}}", MyDummyBean.class));
+ assertSame(foo, context.getRegistry().lookupByNameAndType("{{bean.foo}}", MyFooBean.class));
+ assertSame(bar, context.getRegistry().lookupByNameAndType("{{bean.bar}}", MyDummyBean.class));
try {
- context.getRegistry().lookup("{{bean.unknown}}", MyDummyBean.class);
+ context.getRegistry().lookupByNameAndType("{{bean.unknown}}", MyDummyBean.class);
fail("Should have thrown exception");
} catch (RuntimeCamelException e) {
IllegalArgumentException cause = assertIsInstanceOf(IllegalArgumentException.class, e.getCause());
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFromHeaderOverrideEndpointUriTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFromHeaderOverrideEndpointUriTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFromHeaderOverrideEndpointUriTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFromHeaderOverrideEndpointUriTest.java Wed Jan 23 15:26:07 2013
@@ -51,7 +51,7 @@ public class XsltFromHeaderOverrideEndpo
assertTrue(xml.indexOf("<subject>Hey</subject>") > -1);
assertTrue(xml.indexOf("<body>Hello world!</body>") > -1);
- TestBean bean = context.getRegistry().lookup("testBean", TestBean.class);
+ TestBean bean = context.getRegistry().lookupByNameAndType("testBean", TestBean.class);
assertNotNull(bean);
assertEquals("bean.subject", "Hey", bean.getSubject());
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java Wed Jan 23 15:26:07 2013
@@ -52,7 +52,7 @@ public class XsltRouteTest extends Conte
assertTrue(xml.indexOf("<subject>Hey</subject>") > -1);
assertTrue(xml.indexOf("<body>Hello world!</body>") > -1);
- TestBean bean = context.getRegistry().lookup("testBean", TestBean.class);
+ TestBean bean = context.getRegistry().lookupByNameAndType("testBean", TestBean.class);
assertNotNull(bean);
assertEquals("bean.subject", "Hey", bean.getSubject());
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/RegistryLookupTypeClassCastExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/RegistryLookupTypeClassCastExceptionTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/RegistryLookupTypeClassCastExceptionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/RegistryLookupTypeClassCastExceptionTest.java Wed Jan 23 15:26:07 2013
@@ -31,11 +31,11 @@ public class RegistryLookupTypeClassCast
MyClass my = new MyClass();
simple.put("my", my);
- assertEquals(my, simple.lookup("my"));
- assertEquals(my, simple.lookup("my", MyClass.class));
+ assertEquals(my, simple.lookupByName("my"));
+ assertEquals(my, simple.lookupByNameAndType("my", MyClass.class));
- assertNull(simple.lookup("foo"));
- assertNull(simple.lookup("foo", MyClass.class));
+ assertNull(simple.lookupByName("foo"));
+ assertNull(simple.lookupByNameAndType("foo", MyClass.class));
}
public void testCamelContextLookupOk() throws Exception {
@@ -45,11 +45,11 @@ public class RegistryLookupTypeClassCast
MyClass my = new MyClass();
simple.put("my", my);
- assertEquals(my, context.getRegistry().lookup("my"));
- assertEquals(my, context.getRegistry().lookup("my", MyClass.class));
+ assertEquals(my, context.getRegistry().lookupByName("my"));
+ assertEquals(my, context.getRegistry().lookupByNameAndType("my", MyClass.class));
- assertNull(context.getRegistry().lookup("foo"));
- assertNull(context.getRegistry().lookup("foo", MyClass.class));
+ assertNull(context.getRegistry().lookupByName("foo"));
+ assertNull(context.getRegistry().lookupByNameAndType("foo", MyClass.class));
}
public void testLookupClassCast() throws Exception {
@@ -59,7 +59,7 @@ public class RegistryLookupTypeClassCast
simple.put("my", my);
try {
- simple.lookup("my", String.class);
+ simple.lookupByNameAndType("my", String.class);
fail("Should have thrown exception");
} catch (NoSuchBeanException e) {
assertEquals("my", e.getName());
@@ -75,7 +75,7 @@ public class RegistryLookupTypeClassCast
simple.put("my", my);
try {
- context.getRegistry().lookup("my", String.class);
+ context.getRegistry().lookupByNameAndType("my", String.class);
fail("Should have thrown exception");
} catch (NoSuchBeanException e) {
assertEquals("my", e.getName());
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/RegistryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/RegistryTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/RegistryTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/RegistryTest.java Wed Jan 23 15:26:07 2013
@@ -34,17 +34,17 @@ public class RegistryTest extends TestCa
registry.bind("foo", foo);
- List<?> list = registry.lookup("foo", List.class);
+ List<?> list = registry.lookupByNameAndType("foo", List.class);
assertEquals("Should be same!", foo, list);
}
public void testDefaultProviderAllowsValuesToBeCreatedInThePropertiesFile() throws Exception {
- Object value = registry.lookup("foo");
+ Object value = registry.lookupByName("foo");
assertEquals("lookup of foo", "bar", value);
}
public void testLookupOfUnknownName() throws Exception {
- Object value = registry.lookup("No such entry!");
+ Object value = registry.lookupByName("No such entry!");
assertNull("Should not find anything!", value);
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/RoutePolicyRefCallbackTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/RoutePolicyRefCallbackTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/RoutePolicyRefCallbackTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/RoutePolicyRefCallbackTest.java Wed Jan 23 15:26:07 2013
@@ -32,7 +32,7 @@ public class RoutePolicyRefCallbackTest
@Override
protected MyRoutePolicy getAndInitMyRoutePolicy() {
- return context.getRegistry().lookup("myPolicy", MyRoutePolicy.class);
+ return context.getRegistry().lookupByNameAndType("myPolicy", MyRoutePolicy.class);
}
@Override
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/SimpleRegistryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/SimpleRegistryTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/SimpleRegistryTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/SimpleRegistryTest.java Wed Jan 23 15:26:07 2013
@@ -32,20 +32,20 @@ public class SimpleRegistryTest extends
}
public void testLookupByName() {
- assertEquals("b", registry.lookup("a"));
+ assertEquals("b", registry.lookupByName("a"));
}
public void testLookupByWrongName() {
- assertNull(registry.lookup("x"));
+ assertNull(registry.lookupByName("x"));
}
public void testLookupByNameAndType() {
- assertEquals("b", registry.lookup("a", String.class));
+ assertEquals("b", registry.lookupByNameAndType("a", String.class));
}
public void testLookupByNameAndWrongType() {
try {
- registry.lookup("a", Float.class);
+ registry.lookupByNameAndType("a", Float.class);
fail();
} catch (NoSuchBeanException e) {
// expected
@@ -55,17 +55,17 @@ public class SimpleRegistryTest extends
}
public void testLookupByType() {
- Map<?, ?> map = registry.lookupByType(String.class);
+ Map<?, ?> map = registry.findByTypeWithName(String.class);
assertEquals(1, map.size());
assertEquals("b", map.get("a"));
- map = registry.lookupByType(Object.class);
+ map = registry.findByTypeWithName(Object.class);
assertEquals(2, map.size());
assertEquals("b", map.get("a"));
assertEquals(1, map.get("c"));
}
public void testLookupByWrongType() {
- Map<?, ?> map = registry.lookupByType(Float.class);
+ Map<?, ?> map = registry.findByTypeWithName(Float.class);
assertEquals(0, map.size());
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/language/BeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/BeanTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/language/BeanTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/language/BeanTest.java Wed Jan 23 15:26:07 2013
@@ -87,7 +87,7 @@ public class BeanTest extends LanguageTe
assertNull(result);
assertNotNull(exchange.getException());
MethodNotFoundException e = assertIsInstanceOf(MethodNotFoundException.class, exchange.getException());
- assertSame(context.getRegistry().lookup("foo"), e.getBean());
+ assertSame(context.getRegistry().lookupByName("foo"), e.getBean());
assertEquals("cake", e.getMethodName());
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/main/MainTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/main/MainTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/main/MainTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/main/MainTest.java Wed Jan 23 15:26:07 2013
@@ -43,7 +43,7 @@ public class MainTest extends TestCase {
assertNotNull(contextList);
assertEquals("Did not get the expected count of Camel contexts", 1, contextList.size());
CamelContext camelContext = contextList.get(0);
- assertEquals("Could not find the registry bound object", 31, ((DefaultCamelContext) camelContext).getRegistry().lookup("foo"));
+ assertEquals("Could not find the registry bound object", 31, ((DefaultCamelContext) camelContext).getRegistry().lookupByName("foo"));
MockEndpoint endpoint = camelContext.getEndpoint("mock:results", MockEndpoint.class);
endpoint.expectedMinimumMessageCount(1);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/model/LoadRouteFromXmlWithPolicyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/model/LoadRouteFromXmlWithPolicyTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/model/LoadRouteFromXmlWithPolicyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/model/LoadRouteFromXmlWithPolicyTest.java Wed Jan 23 15:26:07 2013
@@ -66,7 +66,7 @@ public class LoadRouteFromXmlWithPolicyT
assertMockEndpointsSatisfied();
- MyPolicy foo = context.getRegistry().lookup("foo", MyPolicy.class);
+ MyPolicy foo = context.getRegistry().lookupByNameAndType("foo", MyPolicy.class);
assertEquals("Should only be invoked 1 time", 1, foo.getInvoked());
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java Wed Jan 23 15:26:07 2013
@@ -51,7 +51,7 @@ public class BeanRecipientListTest exten
}
protected void checkBean() throws Exception {
- Object lookedUpBean = context.getRegistry().lookup("myBean");
+ Object lookedUpBean = context.getRegistry().lookupByName("myBean");
assertSame("Lookup of 'myBean' should return same object!", myBean, lookedUpBean);
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanRouteTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanRouteTest.java Wed Jan 23 15:26:07 2013
@@ -60,7 +60,7 @@ public class BeanRouteTest extends Conte
protected void setUp() throws Exception {
super.setUp();
- Object lookedUpBean = context.getRegistry().lookup("myBean");
+ Object lookedUpBean = context.getRegistry().lookupByName("myBean");
assertSame("Lookup of 'myBean' should return same object!", myBean, lookedUpBean);
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DefinitionPolicyPerProcessorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DefinitionPolicyPerProcessorTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DefinitionPolicyPerProcessorTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DefinitionPolicyPerProcessorTest.java Wed Jan 23 15:26:07 2013
@@ -41,7 +41,7 @@ public class DefinitionPolicyPerProcesso
assertMockEndpointsSatisfied();
- MyPolicy foo = context.getRegistry().lookup("foo", MyPolicy.class);
+ MyPolicy foo = context.getRegistry().lookupByNameAndType("foo", MyPolicy.class);
assertEquals("Should only be invoked 1 time", 1, foo.getInvoked());
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PolicyPerProcessorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PolicyPerProcessorTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PolicyPerProcessorTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PolicyPerProcessorTest.java Wed Jan 23 15:26:07 2013
@@ -44,8 +44,8 @@ public class PolicyPerProcessorTest exte
assertMockEndpointsSatisfied();
- MyPolicy foo = context.getRegistry().lookup("foo", MyPolicy.class);
- MyPolicy bar = context.getRegistry().lookup("bar", MyPolicy.class);
+ MyPolicy foo = context.getRegistry().lookupByNameAndType("foo", MyPolicy.class);
+ MyPolicy bar = context.getRegistry().lookupByNameAndType("bar", MyPolicy.class);
assertEquals("Should only be invoked 1 time", 1, foo.getInvoked());
assertEquals("Should only be invoked 1 time", 1, bar.getInvoked());
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PolicyPerRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PolicyPerRouteTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PolicyPerRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PolicyPerRouteTest.java Wed Jan 23 15:26:07 2013
@@ -44,7 +44,7 @@ public class PolicyPerRouteTest extends
assertMockEndpointsSatisfied();
- MyPolicy foo = context.getRegistry().lookup("foo", MyPolicy.class);
+ MyPolicy foo = context.getRegistry().lookupByNameAndType("foo", MyPolicy.class);
assertEquals("Should only be invoked 1 time", 1, foo.getInvoked());
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java Wed Jan 23 15:26:07 2013
@@ -34,7 +34,7 @@ public class SplitterWithCustomThreadPoo
public void testSplitterWithCustomThreadPoolExecutor() throws Exception {
ThreadPoolExecutor threadPoolExecutor = (ThreadPoolExecutor) getSplitter().getExecutorService();
if (threadPoolExecutor == null) {
- threadPoolExecutor = context.getRegistry().lookup(getSplitter().getExecutorServiceRef(), ThreadPoolExecutor.class);
+ threadPoolExecutor = context.getRegistry().lookupByNameAndType(getSplitter().getExecutorServiceRef(), ThreadPoolExecutor.class);
}
// this should be sufficient as core pool size is the only thing I changed from the default
assertTrue(threadPoolExecutor.getCorePoolSize() == getThreadPoolExecutor().getCorePoolSize());
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateForceCompletionOnStopTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateForceCompletionOnStopTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateForceCompletionOnStopTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateForceCompletionOnStopTest.java Wed Jan 23 15:26:07 2013
@@ -27,7 +27,7 @@ import org.apache.camel.processor.BodyIn
public class AggregateForceCompletionOnStopTest extends ContextTestSupport {
public void testForceCompletionTrue() throws Exception {
- MyCompletionProcessor myCompletionProcessor = context.getRegistry().lookup("myCompletionProcessor", MyCompletionProcessor.class);
+ MyCompletionProcessor myCompletionProcessor = context.getRegistry().lookupByNameAndType("myCompletionProcessor", MyCompletionProcessor.class);
myCompletionProcessor.reset();
context.getShutdownStrategy().setShutdownNowOnTimeout(true);
@@ -44,7 +44,7 @@ public class AggregateForceCompletionOnS
}
public void testForceCompletionFalse() throws Exception {
- MyCompletionProcessor myCompletionProcessor = context.getRegistry().lookup("myCompletionProcessor", MyCompletionProcessor.class);
+ MyCompletionProcessor myCompletionProcessor = context.getRegistry().lookupByNameAndType("myCompletionProcessor", MyCompletionProcessor.class);
myCompletionProcessor.reset();
context.getShutdownStrategy().setShutdownNowOnTimeout(true);
@@ -61,7 +61,7 @@ public class AggregateForceCompletionOnS
}
public void testStopRouteForceCompletionTrue() throws Exception {
- MyCompletionProcessor myCompletionProcessor = context.getRegistry().lookup("myCompletionProcessor", MyCompletionProcessor.class);
+ MyCompletionProcessor myCompletionProcessor = context.getRegistry().lookupByNameAndType("myCompletionProcessor", MyCompletionProcessor.class);
myCompletionProcessor.reset();
context.getShutdownStrategy().setShutdownNowOnTimeout(true);
@@ -79,7 +79,7 @@ public class AggregateForceCompletionOnS
}
public void testStopRouteForceCompletionFalse() throws Exception {
- MyCompletionProcessor myCompletionProcessor = context.getRegistry().lookup("myCompletionProcessor", MyCompletionProcessor.class);
+ MyCompletionProcessor myCompletionProcessor = context.getRegistry().lookupByNameAndType("myCompletionProcessor", MyCompletionProcessor.class);
myCompletionProcessor.reset();
context.getShutdownStrategy().setShutdownNowOnTimeout(true);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointPolicyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointPolicyTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointPolicyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointPolicyTest.java Wed Jan 23 15:26:07 2013
@@ -58,7 +58,7 @@ public class AsyncEndpointPolicyTest ext
assertMockEndpointsSatisfied();
- MyPolicy foo = context.getRegistry().lookup("foo", MyPolicy.class);
+ MyPolicy foo = context.getRegistry().lookupByNameAndType("foo", MyPolicy.class);
assertEquals("Should only be invoked 1 time", 1, foo.getInvoked());
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipDataModificationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipDataModificationTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipDataModificationTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipDataModificationTest.java Wed Jan 23 15:26:07 2013
@@ -51,7 +51,7 @@ public class RoutingSlipDataModification
protected void setUp() throws Exception {
super.setUp();
- Object lookedUpBean = context.getRegistry().lookup("myBean");
+ Object lookedUpBean = context.getRegistry().lookupByName("myBean");
assertSame("Lookup of 'myBean' should return same object!", myBean, lookedUpBean);
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipWithExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipWithExceptionTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipWithExceptionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipWithExceptionTest.java Wed Jan 23 15:26:07 2013
@@ -132,7 +132,7 @@ public class RoutingSlipWithExceptionTes
}
});
- Object lookedUpBean = context.getRegistry().lookup("myBean");
+ Object lookedUpBean = context.getRegistry().lookupByName("myBean");
assertSame("Lookup of 'myBean' should return same object!", myBean, lookedUpBean);
}
Modified: camel/trunk/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java (original)
+++ camel/trunk/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java Wed Jan 23 15:26:07 2013
@@ -24,7 +24,7 @@ public class AhcComponentClientConfigSsl
super.configureComponent();
AhcComponent component = context.getComponent("ahc", AhcComponent.class);
- component.setSslContextParameters(context.getRegistry().lookup("sslContextParameters", SSLContextParameters.class));
+ component.setSslContextParameters(context.getRegistry().lookupByNameAndType("sslContextParameters", SSLContextParameters.class));
}
protected String getTestServerEndpointUri() {
Modified: camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentSpringTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentSpringTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentSpringTest.java (original)
+++ camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentSpringTest.java Wed Jan 23 15:26:07 2013
@@ -44,7 +44,7 @@ public class SdbComponentSpringTest exte
public void setUp() throws Exception {
super.setUp();
- amazonSDBClient = context.getRegistry().lookup("amazonSDBClient", AmazonSDBClientMock.class);
+ amazonSDBClient = context.getRegistry().lookupByNameAndType("amazonSDBClient", AmazonSDBClientMock.class);
}
@Test