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 [2/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...
Modified: camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ses/SesComponentSpringTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ses/SesComponentSpringTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ses/SesComponentSpringTest.java (original)
+++ camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ses/SesComponentSpringTest.java Wed Jan 23 15:26:07 2013
@@ -37,7 +37,7 @@ public class SesComponentSpringTest exte
public void setUp() throws Exception {
super.setUp();
- sesClient = context.getRegistry().lookup("amazonSESClient", AmazonSESClientMock.class);
+ sesClient = context.getRegistry().lookupByNameAndType("amazonSESClient", AmazonSESClientMock.class);
}
@Test
Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintComponentResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintComponentResolver.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintComponentResolver.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintComponentResolver.java Wed Jan 23 15:26:07 2013
@@ -36,7 +36,7 @@ public class BlueprintComponentResolver
@Override
public Component resolveComponent(String name, CamelContext context) throws Exception {
try {
- Object bean = context.getRegistry().lookup(name);
+ Object bean = context.getRegistry().lookupByName(name);
if (bean instanceof Component) {
LOG.debug("Found component: {} in registry: {}", name, bean);
return (Component) bean;
@@ -52,7 +52,7 @@ public class BlueprintComponentResolver
LOG.trace("Ignored error looking up bean: " + name + " due: " + e.getMessage(), e);
}
try {
- Object bean = context.getRegistry().lookup(".camelBlueprint.componentResolver." + name);
+ Object bean = context.getRegistry().lookupByName(".camelBlueprint.componentResolver." + name);
if (bean instanceof ComponentResolver) {
LOG.debug("Found component resolver: {} in registry: {}", name, bean);
return ((ComponentResolver) bean).resolveComponent(name, context);
Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java Wed Jan 23 15:26:07 2013
@@ -16,6 +16,7 @@
*/
package org.apache.camel.blueprint;
+import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
@@ -37,11 +38,13 @@ public class BlueprintContainerRegistry
this.blueprintContainer = blueprintContainer;
}
- public Object lookup(String name) {
+ @Override
+ public Object lookupByName(String name) {
return blueprintContainer.getComponentInstance(name);
}
- public <T> T lookup(String name, Class<T> type) {
+ @Override
+ public <T> T lookupByNameAndType(String name, Class<T> type) {
Object answer;
try {
answer = blueprintContainer.getComponentInstance(name);
@@ -63,10 +66,32 @@ public class BlueprintContainerRegistry
}
}
- public <T> Map<String, T> lookupByType(Class<T> type) {
+ @Override
+ public <T> Map<String, T> findByTypeWithName(Class<T> type) {
return lookupByType(blueprintContainer, type);
}
+ @Override
+ public <T> Set<T> findByType(Class<T> type) {
+ Map<String, T> map = lookupByType(blueprintContainer, type);
+ return new HashSet<T>(map.values());
+ }
+
+ @Override
+ public Object lookup(String name) {
+ return lookupByName(name);
+ }
+
+ @Override
+ public <T> T lookup(String name, Class<T> type) {
+ return lookupByNameAndType(name, type);
+ }
+
+ @Override
+ public <T> Map<String, T> lookupByType(Class<T> type) {
+ return findByTypeWithName(type);
+ }
+
public static <T> Map<String, T> lookupByType(BlueprintContainer blueprintContainer, Class<T> type) {
Bundle bundle = (Bundle) blueprintContainer.getComponentInstance("blueprintBundle");
Map<String, T> objects = new LinkedHashMap<String, T>();
Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintDataFormatResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintDataFormatResolver.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintDataFormatResolver.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintDataFormatResolver.java Wed Jan 23 15:26:07 2013
@@ -35,7 +35,7 @@ public class BlueprintDataFormatResolver
@Override
public DataFormat resolveDataFormat(String name, CamelContext context) {
try {
- Object bean = context.getRegistry().lookup(".camelBlueprint.dataformatResolver." + name);
+ Object bean = context.getRegistry().lookupByName(".camelBlueprint.dataformatResolver." + name);
if (bean instanceof DataFormatResolver) {
LOG.debug("Found dataformat resolver: {} in registry: {}", name, bean);
return ((DataFormatResolver) bean).resolveDataFormat(name, context);
Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintLanguageResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintLanguageResolver.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintLanguageResolver.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintLanguageResolver.java Wed Jan 23 15:26:07 2013
@@ -35,7 +35,7 @@ public class BlueprintLanguageResolver e
@Override
public Language resolveLanguage(String name, CamelContext context) {
try {
- Object bean = context.getRegistry().lookup(".camelBlueprint.languageResolver." + name);
+ Object bean = context.getRegistry().lookupByName(".camelBlueprint.languageResolver." + name);
if (bean instanceof LanguageResolver) {
LOG.debug("Found language resolver: {} in registry: {}", name, bean);
return ((LanguageResolver) bean).resolveLanguage(name, context);
Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java Wed Jan 23 15:26:07 2013
@@ -93,7 +93,7 @@ public class CamelProxyFactoryBean exten
// lookup endpoint or we have the url for it
if (getServiceRef() != null) {
- endpoint = getCamelContext().getRegistry().lookup(getServiceRef(), Endpoint.class);
+ endpoint = getCamelContext().getRegistry().lookupByNameAndType(getServiceRef(), Endpoint.class);
} else {
endpoint = getCamelContext().getEndpoint(getServiceUrl());
}
Modified: camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiBeanRegistry.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiBeanRegistry.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiBeanRegistry.java (original)
+++ camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiBeanRegistry.java Wed Jan 23 15:26:07 2013
@@ -17,6 +17,7 @@
package org.apache.camel.cdi;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import javax.enterprise.inject.spi.Bean;
@@ -34,7 +35,7 @@ public class CdiBeanRegistry implements
private static final Logger LOG = LoggerFactory.getLogger(CdiBeanRegistry.class);
@Override
- public Object lookup(final String name) {
+ public Object lookupByName(final String name) {
ObjectHelper.notEmpty(name, "name");
LOG.trace("Looking up bean with name {}", name);
@@ -42,7 +43,7 @@ public class CdiBeanRegistry implements
}
@Override
- public <T> T lookup(final String name, final Class<T> type) {
+ public <T> T lookupByNameAndType(final String name, final Class<T> type) {
ObjectHelper.notEmpty(name, "name");
ObjectHelper.notNull(type, "type");
@@ -51,7 +52,7 @@ public class CdiBeanRegistry implements
}
@Override
- public <T> Map<String, T> lookupByType(final Class<T> type) {
+ public <T> Map<String, T> findByTypeWithName(final Class<T> type) {
ObjectHelper.notNull(type, "type");
LOG.trace("Lookups based of type {}", type);
@@ -70,6 +71,40 @@ public class CdiBeanRegistry implements
}
@Override
+ public <T> Set<T> findByType(Class<T> type) {
+ ObjectHelper.notNull(type, "type");
+
+ LOG.trace("Lookups based of type {}", type);
+ Set<T> beans = new HashSet<T>();
+ Set<Bean<T>> definitions = BeanProvider.getBeanDefinitions(type, true, true);
+
+ if (definitions == null) {
+ return beans;
+ }
+ for (Bean<T> bean : definitions) {
+ if (bean.getName() != null) {
+ beans.add(BeanProvider.getContextualReference(type, bean));
+ }
+ }
+ return beans;
+ }
+
+ @Override
+ public Object lookup(String name) {
+ return lookupByName(name);
+ }
+
+ @Override
+ public <T> T lookup(String name, Class<T> type) {
+ return lookupByNameAndType(name, type);
+ }
+
+ @Override
+ public <T> Map<String, T> lookupByType(Class<T> type) {
+ return findByTypeWithName(type);
+ }
+
+ @Override
public String toString() {
return "CdiRegistry[" + System.identityHashCode(this) + "]";
}
Modified: camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiComponentResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiComponentResolver.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiComponentResolver.java (original)
+++ camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiComponentResolver.java Wed Jan 23 15:26:07 2013
@@ -39,7 +39,7 @@ public class OsgiComponentResolver imple
public Component resolveComponent(String name, CamelContext context) throws Exception {
Object bean = null;
try {
- bean = context.getRegistry().lookup(name);
+ bean = context.getRegistry().lookupByName(name);
if (bean != null) {
LOG.debug("Found component: {} in registry: {}", name, bean);
}
Modified: camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDataFormatResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDataFormatResolver.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDataFormatResolver.java (original)
+++ camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDataFormatResolver.java Wed Jan 23 15:26:07 2013
@@ -39,7 +39,7 @@ public class OsgiDataFormatResolver impl
// lookup in registry first
Object bean = null;
try {
- bean = context.getRegistry().lookup(name);
+ bean = context.getRegistry().lookupByName(name);
if (bean != null) {
LOG.debug("Found language: {} in registry: {}", name, bean);
}
Modified: camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiLanguageResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiLanguageResolver.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiLanguageResolver.java (original)
+++ camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiLanguageResolver.java Wed Jan 23 15:26:07 2013
@@ -40,7 +40,7 @@ public class OsgiLanguageResolver implem
// lookup in registry first
Object bean = null;
try {
- bean = context.getRegistry().lookup(name);
+ bean = context.getRegistry().lookupByName(name);
if (bean != null) {
LOG.debug("Found language: {} in registry: {}", name, bean);
}
Modified: camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java (original)
+++ camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java Wed Jan 23 15:26:07 2013
@@ -16,9 +16,12 @@
*/
package org.apache.camel.core.osgi;
+import java.util.Collection;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
import java.util.Queue;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -43,9 +46,8 @@ public class OsgiServiceRegistry extends
/**
* Support to lookup the Object with filter with the (name=NAME) and class type
- *
*/
- public <T> T lookup(String name, Class<T> type) {
+ public <T> T lookupByNameAndType(String name, Class<T> type) {
Object service = serviceCacheMap.get(name);
if (service == null) {
ServiceReference<?> sr = null;
@@ -70,7 +72,7 @@ public class OsgiServiceRegistry extends
/**
* It's only support to look up the ServiceReference with Class name
*/
- public Object lookup(String name) {
+ public Object lookupByName(String name) {
Object service = serviceCacheMap.get(name);
if (service == null) {
ServiceReference<?> sr = bundleContext.getServiceReference(name);
@@ -87,7 +89,7 @@ public class OsgiServiceRegistry extends
return service;
}
- 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>();
try {
ServiceReference<?>[] refs = bundleContext.getAllServiceReferences(type.getName(), null);
@@ -111,6 +113,23 @@ public class OsgiServiceRegistry extends
return result;
}
+ public <T> Set<T> findByType(Class<T> type) {
+ Map<String, T> map = findByTypeWithName(type);
+ return new HashSet<T>(map.values());
+ }
+
+ 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);
+ }
+
@Override
public void onContextStop(CamelContext context) {
// Unget the OSGi service
Modified: camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/ServiceRegistryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/ServiceRegistryTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/ServiceRegistryTest.java (original)
+++ camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/ServiceRegistryTest.java Wed Jan 23 15:26:07 2013
@@ -17,6 +17,7 @@
package org.apache.camel.core.osgi;
import java.util.Map;
+import java.util.Set;
import org.apache.camel.core.osgi.test.MyService;
import org.apache.camel.impl.DefaultCamelContext;
@@ -26,22 +27,27 @@ public class ServiceRegistryTest extends
@Test
public void camelContextFactoryServiceRegistryTest() throws Exception {
-
DefaultCamelContext context = new OsgiDefaultCamelContext(getBundleContext());
context.start();
- MyService myService = context.getRegistry().lookup(MyService.class.getName(), MyService.class);
+
+ MyService myService = context.getRegistry().lookupByNameAndType(MyService.class.getName(), MyService.class);
assertNotNull("MyService should not be null", myService);
- myService = context.getRegistry().lookup("test", MyService.class);
+ myService = context.getRegistry().lookupByNameAndType("test", MyService.class);
assertNull("We should not get the MyService Object here", myService);
- Object service = context.getRegistry().lookup(MyService.class.getName());
+ Object service = context.getRegistry().lookupByName(MyService.class.getName());
assertNotNull("MyService should not be null", service);
assertTrue("It should be the instance of MyService ", service instanceof MyService);
- Map<String, MyService> collection = context.getRegistry().lookupByType(MyService.class);
+ Map<String, MyService> collection = context.getRegistry().findByTypeWithName(MyService.class);
assertNotNull("MyService should not be null", collection);
assertNotNull("There should have one MyService.", collection.get(MyService.class.getName()));
+
+ Set<MyService> collection2 = context.getRegistry().findByType(MyService.class);
+ assertNotNull("MyService should not be null", collection2);
+ assertEquals(1, collection2.size());
+
context.stop();
}
Modified: camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java (original)
+++ camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java Wed Jan 23 15:26:07 2013
@@ -199,7 +199,7 @@ public abstract class AbstractCamelConte
getContext().getManagementStrategy().setEventFactory(eventFactory);
}
// set the event notifier strategies if defined
- Map<String, EventNotifier> eventNotifiers = getContext().getRegistry().lookupByType(EventNotifier.class);
+ Map<String, EventNotifier> eventNotifiers = getContext().getRegistry().findByTypeWithName(EventNotifier.class);
if (eventNotifiers != null && !eventNotifiers.isEmpty()) {
for (Entry<String, EventNotifier> entry : eventNotifiers.entrySet()) {
EventNotifier notifier = entry.getValue();
@@ -211,7 +211,7 @@ public abstract class AbstractCamelConte
}
}
// set endpoint strategies if defined
- Map<String, EndpointStrategy> endpointStrategies = getContext().getRegistry().lookupByType(EndpointStrategy.class);
+ Map<String, EndpointStrategy> endpointStrategies = getContext().getRegistry().findByTypeWithName(EndpointStrategy.class);
if (endpointStrategies != null && !endpointStrategies.isEmpty()) {
for (Entry<String, EndpointStrategy> entry : endpointStrategies.entrySet()) {
EndpointStrategy strategy = entry.getValue();
@@ -226,7 +226,7 @@ public abstract class AbstractCamelConte
getContext().setShutdownStrategy(shutdownStrategy);
}
// add global interceptors
- Map<String, InterceptStrategy> interceptStrategies = getContext().getRegistry().lookupByType(InterceptStrategy.class);
+ Map<String, InterceptStrategy> interceptStrategies = getContext().getRegistry().findByTypeWithName(InterceptStrategy.class);
if (interceptStrategies != null && !interceptStrategies.isEmpty()) {
for (Entry<String, InterceptStrategy> entry : interceptStrategies.entrySet()) {
InterceptStrategy strategy = entry.getValue();
@@ -238,7 +238,7 @@ public abstract class AbstractCamelConte
}
}
// set the lifecycle strategy if defined
- Map<String, LifecycleStrategy> lifecycleStrategies = getContext().getRegistry().lookupByType(LifecycleStrategy.class);
+ Map<String, LifecycleStrategy> lifecycleStrategies = getContext().getRegistry().findByTypeWithName(LifecycleStrategy.class);
if (lifecycleStrategies != null && !lifecycleStrategies.isEmpty()) {
for (Entry<String, LifecycleStrategy> entry : lifecycleStrategies.entrySet()) {
LifecycleStrategy strategy = entry.getValue();
@@ -561,7 +561,7 @@ public abstract class AbstractCamelConte
Set<String> defaultIds = new HashSet<String>();
// lookup and use custom profiles from the registry
- Map<String, ThreadPoolProfile> profiles = context.getRegistry().lookupByType(ThreadPoolProfile.class);
+ Map<String, ThreadPoolProfile> profiles = context.getRegistry().findByTypeWithName(ThreadPoolProfile.class);
if (profiles != null && !profiles.isEmpty()) {
for (Entry<String, ThreadPoolProfile> entry : profiles.entrySet()) {
ThreadPoolProfile profile = entry.getValue();
Modified: camel/trunk/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureConfiguration.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureConfiguration.java (original)
+++ camel/trunk/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureConfiguration.java Wed Jan 23 15:26:07 2013
@@ -154,7 +154,7 @@ public class DigitalSignatureConfigurati
*/
public void setPrivateKey(String privateKeyName) {
if (context != null && privateKeyName != null) {
- PrivateKey pk = context.getRegistry().lookup(privateKeyName, PrivateKey.class);
+ PrivateKey pk = context.getRegistry().lookupByNameAndType(privateKeyName, PrivateKey.class);
if (pk != null) {
setPrivateKey(pk);
}
@@ -176,7 +176,7 @@ public class DigitalSignatureConfigurati
*/
public void setPublicKey(String publicKeyName) {
if (context != null && publicKeyName != null) {
- PublicKey pk = context.getRegistry().lookup(publicKeyName, PublicKey.class);
+ PublicKey pk = context.getRegistry().lookupByNameAndType(publicKeyName, PublicKey.class);
if (pk != null) {
setPublicKey(pk);
}
@@ -235,7 +235,7 @@ public class DigitalSignatureConfigurati
*/
public void setCertificate(String certificateName) {
if (context != null && certificateName != null) {
- Certificate certificate = context.getRegistry().lookup(certificateName, Certificate.class);
+ Certificate certificate = context.getRegistry().lookupByNameAndType(certificateName, Certificate.class);
if (certificate != null) {
setCertificate(certificate);
}
@@ -274,7 +274,7 @@ public class DigitalSignatureConfigurati
*/
public void setKeystore(String keystoreName) {
if (context != null && keystoreName != null) {
- KeyStore keystore = context.getRegistry().lookup(keystoreName, KeyStore.class);
+ KeyStore keystore = context.getRegistry().lookupByNameAndType(keystoreName, KeyStore.class);
if (keystore != null) {
setKeystore(keystore);
}
@@ -310,7 +310,7 @@ public class DigitalSignatureConfigurati
*/
public void setSecureRandom(String randomName) {
if (context != null && randomName != null) {
- SecureRandom random = context.getRegistry().lookup(randomName, SecureRandom.class);
+ SecureRandom random = context.getRegistry().lookupByNameAndType(randomName, SecureRandom.class);
if (keystore != null) {
setSecureRandom(random);
}
Modified: camel/trunk/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java (original)
+++ camel/trunk/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java Wed Jan 23 15:26:07 2013
@@ -105,7 +105,7 @@ public class DozerTypeConverterLoader im
CamelToDozerClassResolverAdapter adapter = new CamelToDozerClassResolverAdapter(camelContext);
BeanContainer.getInstance().setClassLoader(adapter);
- Map<String, DozerBeanMapper> mappers = new HashMap<String, DozerBeanMapper>(camelContext.getRegistry().lookupByType(DozerBeanMapper.class));
+ Map<String, DozerBeanMapper> mappers = new HashMap<String, DozerBeanMapper>(camelContext.getRegistry().findByTypeWithName(DozerBeanMapper.class));
if (mapper != null) {
mappers.put("parameter", mapper);
}
Modified: camel/trunk/components/camel-ejb/src/main/java/org/apache/camel/component/ejb/EjbRegistryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ejb/src/main/java/org/apache/camel/component/ejb/EjbRegistryBean.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-ejb/src/main/java/org/apache/camel/component/ejb/EjbRegistryBean.java (original)
+++ camel/trunk/components/camel-ejb/src/main/java/org/apache/camel/component/ejb/EjbRegistryBean.java Wed Jan 23 15:26:07 2013
@@ -41,8 +41,7 @@ public class EjbRegistryBean extends Reg
}
protected Object lookupBean() {
- // TODO: override lookupBean to be backwards compatible with Camel 2.3.0
- return registry.lookup(getName());
+ return registry.lookupByName(getName());
}
}
Modified: camel/trunk/components/camel-ejb/src/test/java/org/apache/camel/component/ejb/SpringGreaterCamelEjbTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ejb/src/test/java/org/apache/camel/component/ejb/SpringGreaterCamelEjbTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-ejb/src/test/java/org/apache/camel/component/ejb/SpringGreaterCamelEjbTest.java (original)
+++ camel/trunk/components/camel-ejb/src/test/java/org/apache/camel/component/ejb/SpringGreaterCamelEjbTest.java Wed Jan 23 15:26:07 2013
@@ -42,7 +42,7 @@ public class SpringGreaterCamelEjbTest e
@Test
public void testLocateOtherBeans() throws Exception {
- GreaterLocal mySpringBean = context().getRegistry().lookup("mySpringBean", GreaterLocal.class);
+ GreaterLocal mySpringBean = context().getRegistry().lookupByNameAndType("mySpringBean", GreaterLocal.class);
assertNotNull("We should get the instance of spring bean", mySpringBean);
}
Modified: camel/trunk/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceConsumer.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceConsumer.java (original)
+++ camel/trunk/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceConsumer.java Wed Jan 23 15:26:07 2013
@@ -123,7 +123,7 @@ class Task implements Runnable {
this.transactionTimeout = transactionTimeout;
this.verb = verb;
if (templateId != null) {
- Entry tmpl = (Entry) this.endpoint.getCamelContext().getRegistry().lookup(templateId);
+ Entry tmpl = (Entry) this.endpoint.getCamelContext().getRegistry().lookupByName(templateId);
template = javaSpace.snapshot(tmpl);
} else {
this.template = javaSpace.snapshot(new InEntry());
Modified: camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java (original)
+++ camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java Wed Jan 23 15:26:07 2013
@@ -60,7 +60,7 @@ public class JcrEndpoint extends Default
this.credentials = new SimpleCredentials(username, password.toCharArray());
}
}
- this.repository = component.getCamelContext().getRegistry().lookup(uri.getHost(), Repository.class);
+ this.repository = component.getCamelContext().getRegistry().lookupByNameAndType(uri.getHost(), Repository.class);
if (repository == null) {
throw new RuntimeCamelException("No JCR repository defined under '" + uri.getHost() + "'");
}
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/config/JmsEndpointWithCustomDestinationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/config/JmsEndpointWithCustomDestinationTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/config/JmsEndpointWithCustomDestinationTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/config/JmsEndpointWithCustomDestinationTest.java Wed Jan 23 15:26:07 2013
@@ -37,7 +37,7 @@ public class JmsEndpointWithCustomDestin
@Test
public void testMessageSentToCustomEndpoint() throws Exception {
- ActiveMQQueue jmsQueue = context.getRegistry().lookup("jmsQueue", ActiveMQQueue.class);
+ ActiveMQQueue jmsQueue = context.getRegistry().lookupByNameAndType("jmsQueue", ActiveMQQueue.class);
assertNotNull("jmsQueue", jmsQueue);
assertEquals("jmsqueue.getPhysicalName()", "Test.Camel.CustomEndpoint", jmsQueue.getPhysicalName());
Modified: camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaComponent.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaComponent.java (original)
+++ camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaComponent.java Wed Jan 23 15:26:07 2013
@@ -81,7 +81,7 @@ public class JpaComponent extends Defaul
// lookup entity manager factory and use it if only one provided
if (entityManagerFactory == null) {
- Map<String, EntityManagerFactory> map = getCamelContext().getRegistry().lookupByType(EntityManagerFactory.class);
+ Map<String, EntityManagerFactory> map = getCamelContext().getRegistry().findByTypeWithName(EntityManagerFactory.class);
if (map != null) {
if (map.size() == 1) {
entityManagerFactory = map.values().iterator().next();
@@ -97,7 +97,7 @@ public class JpaComponent extends Defaul
// lookup transaction manager and use it if only one provided
if (transactionManager == null) {
- Map<String, PlatformTransactionManager> map = getCamelContext().getRegistry().lookupByType(PlatformTransactionManager.class);
+ Map<String, PlatformTransactionManager> map = getCamelContext().getRegistry().findByTypeWithName(PlatformTransactionManager.class);
if (map != null) {
if (map.size() == 1) {
transactionManager = map.values().iterator().next();
@@ -113,7 +113,7 @@ public class JpaComponent extends Defaul
// transaction manager could also be hidden in a template
if (transactionManager == null) {
- Map<String, TransactionTemplate> map = getCamelContext().getRegistry().lookupByType(TransactionTemplate.class);
+ Map<String, TransactionTemplate> map = getCamelContext().getRegistry().findByTypeWithName(TransactionTemplate.class);
if (map != null) {
if (map.size() == 1) {
transactionManager = map.values().iterator().next().getTransactionManager();
Modified: camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteEndpointTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteEndpointTest.java (original)
+++ camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteEndpointTest.java Wed Jan 23 15:26:07 2013
@@ -35,7 +35,7 @@ public class JpaRouteEndpointTest extend
JpaEndpoint jpa = new JpaEndpoint();
jpa.setCamelContext(context);
jpa.setEntityType(SendEmail.class);
- jpa.setEntityManagerFactory(context.getRegistry().lookup("entityManagerFactory", EntityManagerFactory.class));
+ jpa.setEntityManagerFactory(context.getRegistry().lookupByNameAndType("entityManagerFactory", EntityManagerFactory.class));
from("direct:start").to(jpa).to("mock:result");
}
Modified: camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/BeanWithJXPathInjectionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/BeanWithJXPathInjectionTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/BeanWithJXPathInjectionTest.java (original)
+++ camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/BeanWithJXPathInjectionTest.java Wed Jan 23 15:26:07 2013
@@ -35,7 +35,7 @@ public class BeanWithJXPathInjectionTest
public void testSendMessage() throws Exception {
template.sendBody("direct:in", new PersonBean("James", "London"));
- MyBean myBean = context.getRegistry().lookup("myBean", MyBean.class);
+ MyBean myBean = context.getRegistry().lookupByNameAndType("myBean", MyBean.class);
assertEquals("bean foo: " + myBean, "James", myBean.getName());
assertNotNull("Should pass body as well", myBean.getBody());
@@ -45,7 +45,7 @@ public class BeanWithJXPathInjectionTest
public void testSendNullMessage() throws Exception {
template.sendBody("direct:in", new PersonBean(null, "London"));
- MyBean myBean = context.getRegistry().lookup("myBean", MyBean.class);
+ MyBean myBean = context.getRegistry().lookupByNameAndType("myBean", MyBean.class);
assertEquals("bean foo: " + myBean, null, myBean.getName());
assertNotNull("Should pass body as well", myBean.getBody());
Modified: camel/trunk/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapProducer.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapProducer.java (original)
+++ camel/trunk/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapProducer.java Wed Jan 23 15:26:07 2013
@@ -91,7 +91,7 @@ public class LdapProducer extends Defaul
// On the other hand if you have a DirContext that is able to support concurrency
// then using the default singleton scope is entirely sufficient. Most DirContext
// classes will require prototype scope though.
- DirContext dirContext = (DirContext) getEndpoint().getCamelContext().getRegistry().lookup(remaining);
+ DirContext dirContext = (DirContext) getEndpoint().getCamelContext().getRegistry().lookupByName(remaining);
return dirContext;
}
Modified: camel/trunk/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java (original)
+++ camel/trunk/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java Wed Jan 23 15:26:07 2013
@@ -322,7 +322,7 @@ public class MongoDbEndpoint extends Def
* @param writeConcernRef the name of the bean in the registry that represents the WriteConcern to use
*/
public void setWriteConcernRef(String writeConcernRef) {
- WriteConcern wc = this.getCamelContext().getRegistry().lookup(writeConcernRef, WriteConcern.class);
+ WriteConcern wc = this.getCamelContext().getRegistry().lookupByNameAndType(writeConcernRef, WriteConcern.class);
if (wc == null) {
LOG.error("Camel MongoDB component could not find the WriteConcern in the Registry. Verify that the "
+ "provided bean name ({}) is correct. Aborting initialization.", writeConcernRef);
Modified: camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjSpringTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjSpringTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjSpringTest.java (original)
+++ camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjSpringTest.java Wed Jan 23 15:26:07 2013
@@ -45,7 +45,7 @@ public class QuickfixjSpringTest extends
@Test
public void configureInSpring() throws Exception {
SessionID sessionID = new SessionID("FIX.4.2:INITIATOR->ACCEPTOR");
- QuickfixjConfiguration configuration = context.getRegistry().lookup("quickfixjConfiguration", QuickfixjConfiguration.class);
+ QuickfixjConfiguration configuration = context.getRegistry().lookupByNameAndType("quickfixjConfiguration", QuickfixjConfiguration.class);
SessionSettings springSessionSettings = configuration.createSessionSettings();
Properties sessionProperties = springSessionSettings.getSessionProperties(sessionID, true);
Modified: camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java (original)
+++ camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java Wed Jan 23 15:26:07 2013
@@ -108,7 +108,7 @@ public class SoapJaxbDataFormat extends
return;
} else {
if (elementNameStrategyRef != null) {
- elementNameStrategy = exchange.getContext().getRegistry().lookup(elementNameStrategyRef,
+ elementNameStrategy = exchange.getContext().getRegistry().lookupByNameAndType(elementNameStrategyRef,
ElementNameStrategy.class);
} else {
elementNameStrategy = new TypeNameStrategy();
Modified: camel/trunk/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchComponent.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchComponent.java (original)
+++ camel/trunk/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchComponent.java Wed Jan 23 15:26:07 2013
@@ -42,8 +42,8 @@ public class SpringBatchComponent extend
@Override
protected void doStart() throws Exception {
- defaultResolvedJobLauncher = getCamelContext().getRegistry().lookup(DEFAULT_JOB_LAUNCHER_REF_NAME, JobLauncher.class);
- allResolvedJobLaunchers = getCamelContext().getRegistry().lookupByType(JobLauncher.class);
+ defaultResolvedJobLauncher = getCamelContext().getRegistry().lookupByNameAndType(DEFAULT_JOB_LAUNCHER_REF_NAME, JobLauncher.class);
+ allResolvedJobLaunchers = getCamelContext().getRegistry().findByTypeWithName(JobLauncher.class);
}
public void setJobLauncher(JobLauncher jobLauncher) {
Modified: camel/trunk/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java (original)
+++ camel/trunk/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java Wed Jan 23 15:26:07 2013
@@ -73,7 +73,7 @@ public class SpringBatchEndpoint extends
private JobLauncher resolveJobLauncher() {
if (jobLauncherRef != null) {
- JobLauncher jobLauncher = getCamelContext().getRegistry().lookup(jobLauncherRef, JobLauncher.class);
+ JobLauncher jobLauncher = getCamelContext().getRegistry().lookupByNameAndType(jobLauncherRef, JobLauncher.class);
if (jobLauncher == null) {
throw new IllegalStateException(String.format("No JobLauncher named %s found in the registry.", jobLauncherRef));
}
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/CamelProxyFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/CamelProxyFactoryBean.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/CamelProxyFactoryBean.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/CamelProxyFactoryBean.java Wed Jan 23 15:26:07 2013
@@ -60,7 +60,7 @@ public class CamelProxyFactoryBean exten
// lookup endpoint or we have the url for it
if (getServiceRef() != null) {
- endpoint = camelContext.getRegistry().lookup(getServiceRef(), Endpoint.class);
+ endpoint = camelContext.getRegistry().lookupByNameAndType(getServiceRef(), Endpoint.class);
} else {
endpoint = camelContext.getEndpoint(getServiceUrl());
}
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/ApplicationContextRegistry.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/ApplicationContextRegistry.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/ApplicationContextRegistry.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/ApplicationContextRegistry.java Wed Jan 23 15:26:07 2013
@@ -16,7 +16,9 @@
*/
package org.apache.camel.spring.spi;
+import java.util.HashSet;
import java.util.Map;
+import java.util.Set;
import org.apache.camel.NoSuchBeanException;
import org.apache.camel.spi.Registry;
@@ -37,7 +39,8 @@ public class ApplicationContextRegistry
this.applicationContext = applicationContext;
}
- public <T> T lookup(String name, Class<T> type) {
+ @Override
+ public <T> T lookupByNameAndType(String name, Class<T> type) {
Object answer;
try {
answer = applicationContext.getBean(name, type);
@@ -61,7 +64,8 @@ public class ApplicationContextRegistry
}
}
- public Object lookup(String name) {
+ @Override
+ public Object lookupByName(String name) {
try {
return applicationContext.getBean(name);
} catch (NoSuchBeanDefinitionException e) {
@@ -69,7 +73,30 @@ public class ApplicationContextRegistry
}
}
- public <T> Map<String, T> lookupByType(Class<T> type) {
+ @Override
+ public <T> Set<T> findByType(Class<T> type) {
+ Map<String, T> map = applicationContext.getBeansOfType(type);
+ return new HashSet<T>(map.values());
+ }
+
+ @Override
+ public <T> Map<String, T> findByTypeWithName(Class<T> type) {
return applicationContext.getBeansOfType(type);
}
+
+ @Override
+ public Object lookup(String name) {
+ return lookupByName(name);
+ }
+
+ @Override
+ public <T> T lookup(String name, Class<T> type) {
+ return lookupByNameAndType(name, type);
+ }
+
+ @Override
+ public <T> Map<String, T> lookupByType(Class<T> type) {
+ return findByTypeWithName(type);
+ }
+
}
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerInlinedPropertiesPlaceholderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerInlinedPropertiesPlaceholderTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerInlinedPropertiesPlaceholderTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerInlinedPropertiesPlaceholderTest.java Wed Jan 23 15:26:07 2013
@@ -37,7 +37,7 @@ public class SpringErrorHandlerInlinedPr
assertMockEndpointsSatisfied();
- MyErrorBean bean = context.getRegistry().lookup("errorBean", MyErrorBean.class);
+ MyErrorBean bean = context.getRegistry().lookupByNameAndType("errorBean", MyErrorBean.class);
assertNotNull(bean);
// 1 regular and 3 redeliveries
assertEquals(3 + 1, bean.getCounter());
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerPropertiesPlaceholderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerPropertiesPlaceholderTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerPropertiesPlaceholderTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerPropertiesPlaceholderTest.java Wed Jan 23 15:26:07 2013
@@ -37,7 +37,7 @@ public class SpringErrorHandlerPropertie
assertMockEndpointsSatisfied();
- MyErrorBean bean = context.getRegistry().lookup("errorBean", MyErrorBean.class);
+ MyErrorBean bean = context.getRegistry().lookupByNameAndType("errorBean", MyErrorBean.class);
assertNotNull(bean);
// 1 regular and 3 redeliveries
assertEquals(3 + 1, bean.getCounter());
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/aop/SpringAopClassLevelCamelBeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/aop/SpringAopClassLevelCamelBeanTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/aop/SpringAopClassLevelCamelBeanTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/aop/SpringAopClassLevelCamelBeanTest.java Wed Jan 23 15:26:07 2013
@@ -57,7 +57,7 @@ public class SpringAopClassLevelCamelBea
assertMockEndpointsSatisfied();
- ExceptionInterceptor ei = context.getRegistry().lookup("exceptionInterceptor", ExceptionInterceptor.class);
+ ExceptionInterceptor ei = context.getRegistry().lookupByNameAndType("exceptionInterceptor", ExceptionInterceptor.class);
IllegalArgumentException iae = assertIsInstanceOf(IllegalArgumentException.class, ei.getE());
assertEquals("Foo has not expected value ABC but Damn", iae.getMessage());
}
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest.java Wed Jan 23 15:26:07 2013
@@ -39,19 +39,19 @@ public class ConsumerTemplateAlreadyExis
public void testHasExistingTemplate() {
assertNotNull("Should have injected a consumer template", template);
- ConsumerTemplate lookup = context.getRegistry().lookup("myConsumerTemplate", ConsumerTemplate.class);
+ ConsumerTemplate lookup = context.getRegistry().lookupByNameAndType("myConsumerTemplate", ConsumerTemplate.class);
assertNotNull("Should lookup consumer template", lookup);
- ConsumerTemplate lookup2 = context.getRegistry().lookup("consumerTemplate", ConsumerTemplate.class);
+ ConsumerTemplate lookup2 = context.getRegistry().lookupByNameAndType("consumerTemplate", ConsumerTemplate.class);
assertNull("Should not be able to lookup consumer template", lookup2);
}
@Test
public void testShouldBeSingleton() {
- ConsumerTemplate lookup = context.getRegistry().lookup("myConsumerTemplate", ConsumerTemplate.class);
+ ConsumerTemplate lookup = context.getRegistry().lookupByNameAndType("myConsumerTemplate", ConsumerTemplate.class);
assertNotNull("Should lookup producer template", lookup);
- ConsumerTemplate lookup2 = context.getRegistry().lookup("myConsumerTemplate", ConsumerTemplate.class);
+ ConsumerTemplate lookup2 = context.getRegistry().lookupByNameAndType("myConsumerTemplate", ConsumerTemplate.class);
assertNotNull("Should lookup producer template", lookup);
assertSame("Should be same instances (singleton)", lookup, lookup2);
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest.java Wed Jan 23 15:26:07 2013
@@ -41,7 +41,7 @@ public class ConsumerTemplateAutoRegiste
assertNotNull("Should have injected a consumer template", template);
assertNotNull("The template context should not be null", ((DefaultConsumerTemplate)template).getCamelContext());
- ConsumerTemplate lookup = context.getRegistry().lookup("consumerTemplate", ConsumerTemplate.class);
+ ConsumerTemplate lookup = context.getRegistry().lookupByNameAndType("consumerTemplate", ConsumerTemplate.class);
assertNotNull("Should lookup consumer template", lookup);
}
}
\ No newline at end of file
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateHasTwoTemplatesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateHasTwoTemplatesTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateHasTwoTemplatesTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateHasTwoTemplatesTest.java Wed Jan 23 15:26:07 2013
@@ -34,10 +34,10 @@ public class ConsumerTemplateHasTwoTempl
@Test
public void testHasTwoTemplates() {
- ConsumerTemplate lookup = context.getRegistry().lookup("myTemplate", ConsumerTemplate.class);
+ ConsumerTemplate lookup = context.getRegistry().lookupByNameAndType("myTemplate", ConsumerTemplate.class);
assertNotNull("Should lookup producer template", lookup);
- ConsumerTemplate lookup2 = context.getRegistry().lookup("myOtherTemplate", ConsumerTemplate.class);
+ ConsumerTemplate lookup2 = context.getRegistry().lookupByNameAndType("myOtherTemplate", ConsumerTemplate.class);
assertNotNull("Should lookup producer template", lookup2);
assertNotSame("Should not be same", lookup, lookup2);
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateMaximumCacheSizeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateMaximumCacheSizeTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateMaximumCacheSizeTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateMaximumCacheSizeTest.java Wed Jan 23 15:26:07 2013
@@ -40,7 +40,7 @@ public class ConsumerTemplateMaximumCach
public void testTemplateMaximumCache() throws Exception {
assertNotNull("Should have injected a consumer template", template);
- ConsumerTemplate lookup = context.getRegistry().lookup("template", ConsumerTemplate.class);
+ ConsumerTemplate lookup = context.getRegistry().lookupByNameAndType("template", ConsumerTemplate.class);
assertNotNull("Should lookup consumer template", lookup);
assertEquals(50, template.getMaximumCacheSize());
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest.java Wed Jan 23 15:26:07 2013
@@ -39,19 +39,19 @@ public class ProducerTemplateAlreadyExis
public void testHasExistingTemplate() {
assertNotNull("Should have injected a producer template", template);
- ProducerTemplate lookup = context.getRegistry().lookup("myTemplate", ProducerTemplate.class);
+ ProducerTemplate lookup = context.getRegistry().lookupByNameAndType("myTemplate", ProducerTemplate.class);
assertNotNull("Should lookup producer template", lookup);
- ProducerTemplate lookup2 = context.getRegistry().lookup("template", ProducerTemplate.class);
+ ProducerTemplate lookup2 = context.getRegistry().lookupByNameAndType("template", ProducerTemplate.class);
assertNull("Should not be able to lookup producer template", lookup2);
}
@Test
public void testShouldBeSingleton() {
- ProducerTemplate lookup = context.getRegistry().lookup("myTemplate", ProducerTemplate.class);
+ ProducerTemplate lookup = context.getRegistry().lookupByNameAndType("myTemplate", ProducerTemplate.class);
assertNotNull("Should lookup producer template", lookup);
- ProducerTemplate lookup2 = context.getRegistry().lookup("myTemplate", ProducerTemplate.class);
+ ProducerTemplate lookup2 = context.getRegistry().lookupByNameAndType("myTemplate", ProducerTemplate.class);
assertNotNull("Should lookup producer template", lookup);
assertSame("Should be same instances (singleton)", lookup, lookup2);
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterBeanIdExistsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterBeanIdExistsTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterBeanIdExistsTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterBeanIdExistsTest.java Wed Jan 23 15:26:07 2013
@@ -35,13 +35,13 @@ public class ProducerTemplateAutoRegiste
@Test
public void testHasNoTemplate() {
- Object lookup = context.getRegistry().lookup("template");
+ Object lookup = context.getRegistry().lookupByName("template");
assertFalse("Should not be a producer template", lookup instanceof ProducerTemplate);
}
@Test
public void testHasConsumerTemplate() {
- Object lookup = context.getRegistry().lookup("consumerTemplate");
+ Object lookup = context.getRegistry().lookupByName("consumerTemplate");
assertTrue("Should be a consumer template", lookup instanceof ConsumerTemplate);
}
}
\ No newline at end of file
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest.java Wed Jan 23 15:26:07 2013
@@ -39,7 +39,7 @@ public class ProducerTemplateAutoRegiste
public void testHasTemplate() {
assertNotNull("Should have injected a producer template", template);
- ProducerTemplate lookup = context.getRegistry().lookup("template", ProducerTemplate.class);
+ ProducerTemplate lookup = context.getRegistry().lookupByNameAndType("template", ProducerTemplate.class);
assertNotNull("Should lookup producer template", lookup);
}
}
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTwoCamelContextsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTwoCamelContextsTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTwoCamelContextsTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTwoCamelContextsTest.java Wed Jan 23 15:26:07 2013
@@ -39,25 +39,25 @@ public class ProducerTemplateAutoRegiste
@Test
public void testHasNoTemplateCamel1() {
- ProducerTemplate lookup = context1.getRegistry().lookup("template", ProducerTemplate.class);
+ ProducerTemplate lookup = context1.getRegistry().lookupByNameAndType("template", ProducerTemplate.class);
assertNull("Should NOT lookup producer template", lookup);
}
@Test
public void testHasNoTemplateCamel2() {
- ProducerTemplate lookup = context2.getRegistry().lookup("template", ProducerTemplate.class);
+ ProducerTemplate lookup = context2.getRegistry().lookupByNameAndType("template", ProducerTemplate.class);
assertNull("Should NOT lookup producer template", lookup);
}
@Test
public void testHasNoConsumerTemplateCamel1() {
- ConsumerTemplate lookup = context1.getRegistry().lookup("consumerTemplate", ConsumerTemplate.class);
+ ConsumerTemplate lookup = context1.getRegistry().lookupByNameAndType("consumerTemplate", ConsumerTemplate.class);
assertNull("Should NOT lookup consumer template", lookup);
}
@Test
public void testHasNoConsumerTemplateCamel2() {
- ConsumerTemplate lookup = context2.getRegistry().lookup("consumerTemplate", ConsumerTemplate.class);
+ ConsumerTemplate lookup = context2.getRegistry().lookupByNameAndType("consumerTemplate", ConsumerTemplate.class);
assertNull("Should NOT lookup consumer template", lookup);
}
}
\ No newline at end of file
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateHasTwoTemplatesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateHasTwoTemplatesTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateHasTwoTemplatesTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateHasTwoTemplatesTest.java Wed Jan 23 15:26:07 2013
@@ -34,10 +34,10 @@ public class ProducerTemplateHasTwoTempl
@Test
public void testHasTwoTemplates() {
- ProducerTemplate lookup = context.getRegistry().lookup("myTemplate", ProducerTemplate.class);
+ ProducerTemplate lookup = context.getRegistry().lookupByNameAndType("myTemplate", ProducerTemplate.class);
assertNotNull("Should lookup producer template", lookup);
- ProducerTemplate lookup2 = context.getRegistry().lookup("myOtherTemplate", ProducerTemplate.class);
+ ProducerTemplate lookup2 = context.getRegistry().lookupByNameAndType("myOtherTemplate", ProducerTemplate.class);
assertNotNull("Should lookup producer template", lookup2);
assertNotSame("Should not be same", lookup, lookup2);
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateMaximumCacheSizeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateMaximumCacheSizeTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateMaximumCacheSizeTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateMaximumCacheSizeTest.java Wed Jan 23 15:26:07 2013
@@ -40,7 +40,7 @@ public class ProducerTemplateMaximumCach
public void testTemplateMaximumCache() throws Exception {
assertNotNull("Should have injected a producer template", template);
- ProducerTemplate lookup = context.getRegistry().lookup("template", ProducerTemplate.class);
+ ProducerTemplate lookup = context.getRegistry().lookupByNameAndType("template", ProducerTemplate.class);
assertNotNull("Should lookup producer template", lookup);
assertEquals(50, template.getMaximumCacheSize());
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateMixedAutoRegisterTwoCamelContextsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateMixedAutoRegisterTwoCamelContextsTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateMixedAutoRegisterTwoCamelContextsTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateMixedAutoRegisterTwoCamelContextsTest.java Wed Jan 23 15:26:07 2013
@@ -39,27 +39,27 @@ public class ProducerTemplateMixedAutoRe
@Test
public void testHasTemplateCamel1() {
- DefaultProducerTemplate lookup = context1.getRegistry().lookup("template1", DefaultProducerTemplate.class);
+ DefaultProducerTemplate lookup = context1.getRegistry().lookupByNameAndType("template1", DefaultProducerTemplate.class);
assertNotNull("Should lookup producer template", lookup);
assertEquals("camel1", lookup.getCamelContext().getName());
}
@Test
public void testHasTemplateCamel2() {
- DefaultProducerTemplate lookup = context1.getRegistry().lookup("template2", DefaultProducerTemplate.class);
+ DefaultProducerTemplate lookup = context1.getRegistry().lookupByNameAndType("template2", DefaultProducerTemplate.class);
assertNotNull("Should lookup producer template", lookup);
assertEquals("camel2", lookup.getCamelContext().getName());
}
@Test
public void testHasNoConsumerTemplateCamel1() {
- ConsumerTemplate lookup = context1.getRegistry().lookup("consumerTemplate", ConsumerTemplate.class);
+ ConsumerTemplate lookup = context1.getRegistry().lookupByNameAndType("consumerTemplate", ConsumerTemplate.class);
assertNull("Should NOT lookup consumer template", lookup);
}
@Test
public void testHasNoConsumerTemplateCamel2() {
- ConsumerTemplate lookup = context2.getRegistry().lookup("consumerTemplate", ConsumerTemplate.class);
+ ConsumerTemplate lookup = context2.getRegistry().lookupByNameAndType("consumerTemplate", ConsumerTemplate.class);
assertNull("Should NOT lookup consumer template", lookup);
}
}
\ No newline at end of file
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextDependsOnTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextDependsOnTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextDependsOnTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextDependsOnTest.java Wed Jan 23 15:26:07 2013
@@ -37,8 +37,8 @@ public class SpringCamelContextDependsOn
assertMockEndpointsSatisfied();
- long time1 = context.getRegistry().lookup("myDependsOnBean", MyDependsOnBean.class).getTime();
- long time2 = context.getRegistry().lookup("myRouteBuilder", MyDependsOnRouteBuilder.class).getTime();
+ long time1 = context.getRegistry().lookupByNameAndType("myDependsOnBean", MyDependsOnBean.class).getTime();
+ long time2 = context.getRegistry().lookupByNameAndType("myRouteBuilder", MyDependsOnRouteBuilder.class).getTime();
assertTrue("myDependsOnBean should be created before myRouteBuilder", time1 < time2);
}
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextNoDependsOnTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextNoDependsOnTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextNoDependsOnTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextNoDependsOnTest.java Wed Jan 23 15:26:07 2013
@@ -38,8 +38,8 @@ public class SpringCamelContextNoDepends
assertMockEndpointsSatisfied();
// in this example CamelContext is created first, then route builder, and then the depends on bean is last
- long time1 = context.getRegistry().lookup("myDependsOnBean", MyDependsOnBean.class).getTime();
- long time2 = context.getRegistry().lookup("myRouteBuilder", MyDependsOnRouteBuilder.class).getTime();
+ long time1 = context.getRegistry().lookupByNameAndType("myDependsOnBean", MyDependsOnBean.class).getTime();
+ long time2 = context.getRegistry().lookupByNameAndType("myRouteBuilder", MyDependsOnRouteBuilder.class).getTime();
assertTrue("myDependsOnBean should NOT be created before myRouteBuilder", time1 > time2);
}
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringProduceInjectedPrototypeBeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringProduceInjectedPrototypeBeanTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringProduceInjectedPrototypeBeanTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringProduceInjectedPrototypeBeanTest.java Wed Jan 23 15:26:07 2013
@@ -33,7 +33,7 @@ public class SpringProduceInjectedProtot
public void testProduceInjectedOnce() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Hello World", "Bye World");
- MyProduceBean bean = context.getRegistry().lookup("myProducerBean", MyProduceBean.class);
+ MyProduceBean bean = context.getRegistry().lookupByNameAndType("myProducerBean", MyProduceBean.class);
bean.testDoSomething("Hello World");
bean.testDoSomething("Bye World");
@@ -44,11 +44,11 @@ public class SpringProduceInjectedProtot
public void testProduceInjectedTwice() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Hello World", "Bye World");
- MyProduceBean bean = context.getRegistry().lookup("myProducerBean", MyProduceBean.class);
+ MyProduceBean bean = context.getRegistry().lookupByNameAndType("myProducerBean", MyProduceBean.class);
bean.testDoSomething("Hello World");
- MyProduceBean bean2 = context.getRegistry().lookup("myProducerBean", MyProduceBean.class);
+ MyProduceBean bean2 = context.getRegistry().lookupByNameAndType("myProducerBean", MyProduceBean.class);
bean2.testDoSomething("Bye World");
assertMockEndpointsSatisfied();
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringProduceInjectedSingletonBeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringProduceInjectedSingletonBeanTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringProduceInjectedSingletonBeanTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringProduceInjectedSingletonBeanTest.java Wed Jan 23 15:26:07 2013
@@ -33,7 +33,7 @@ public class SpringProduceInjectedSingle
public void testProduceInjectedOnce() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Hello World", "Bye World");
- MyProduceBean bean = context.getRegistry().lookup("myProducerBean", MyProduceBean.class);
+ MyProduceBean bean = context.getRegistry().lookupByNameAndType("myProducerBean", MyProduceBean.class);
bean.testDoSomething("Hello World");
bean.testDoSomething("Bye World");
@@ -44,11 +44,11 @@ public class SpringProduceInjectedSingle
public void testProduceInjectedTwice() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Hello World", "Bye World");
- MyProduceBean bean = context.getRegistry().lookup("myProducerBean", MyProduceBean.class);
+ MyProduceBean bean = context.getRegistry().lookupByNameAndType("myProducerBean", MyProduceBean.class);
bean.testDoSomething("Hello World");
- MyProduceBean bean2 = context.getRegistry().lookup("myProducerBean", MyProduceBean.class);
+ MyProduceBean bean2 = context.getRegistry().lookupByNameAndType("myProducerBean", MyProduceBean.class);
bean2.testDoSomething("Bye World");
assertMockEndpointsSatisfied();
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ProduceSplitMethodCallIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ProduceSplitMethodCallIssueTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ProduceSplitMethodCallIssueTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/ProduceSplitMethodCallIssueTest.java Wed Jan 23 15:26:07 2013
@@ -33,7 +33,7 @@ public class ProduceSplitMethodCallIssue
public void testProduceSplitMethodCallIssue() throws Exception {
getMockEndpoint("mock:split").expectedBodiesReceived("Hello A", "Hello B");
- CoolService cool = context.getRegistry().lookup("cool", CoolService.class);
+ CoolService cool = context.getRegistry().lookupByNameAndType("cool", CoolService.class);
String out = cool.stuff("A,B");
// keeps the original message
assertEquals("A,B", out);
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/RedeliveryErrorHandlerTwoXmlFilesIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/RedeliveryErrorHandlerTwoXmlFilesIssueTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/RedeliveryErrorHandlerTwoXmlFilesIssueTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/RedeliveryErrorHandlerTwoXmlFilesIssueTest.java Wed Jan 23 15:26:07 2013
@@ -42,7 +42,7 @@ public class RedeliveryErrorHandlerTwoXm
assertMockEndpointsSatisfied();
- OnRedeliveryCounter counter = context.getRegistry().lookup("counter", OnRedeliveryCounter.class);
+ OnRedeliveryCounter counter = context.getRegistry().lookupByNameAndType("counter", OnRedeliveryCounter.class);
assertEquals(3, counter.getCounter());
}
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringInitializationIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringInitializationIssueTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringInitializationIssueTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringInitializationIssueTest.java Wed Jan 23 15:26:07 2013
@@ -40,6 +40,6 @@ public class SpringInitializationIssueTe
}
private List<?> getNamesList(String beanName) {
- return context.getRegistry().lookup(beanName, List.class);
+ return context.getRegistry().lookupByNameAndType(beanName, List.class);
}
}
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/CamelCustomPostProcessorOnRouteBuilderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/CamelCustomPostProcessorOnRouteBuilderTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/CamelCustomPostProcessorOnRouteBuilderTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/CamelCustomPostProcessorOnRouteBuilderTest.java Wed Jan 23 15:26:07 2013
@@ -38,7 +38,7 @@ public class CamelCustomPostProcessorOnR
assertMockEndpointsSatisfied();
- TestPojo pojo = (TestPojo) context.getRegistry().lookup("testPojo");
+ TestPojo pojo = (TestPojo) context.getRegistry().lookupByName("testPojo");
assertNotNull("Test pojo not registered", pojo);
assertEquals("Processor has not changed field value", "Changed Value", pojo.getTestValue());
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringScheduledThreadPoolTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringScheduledThreadPoolTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringScheduledThreadPoolTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringScheduledThreadPoolTest.java Wed Jan 23 15:26:07 2013
@@ -29,7 +29,7 @@ public class SpringScheduledThreadPoolTe
}
public void testScheduledThreadPool() throws Exception {
- SizedScheduledExecutorService pool = context.getRegistry().lookup("myPool", SizedScheduledExecutorService.class);
+ SizedScheduledExecutorService pool = context.getRegistry().lookupByNameAndType("myPool", SizedScheduledExecutorService.class);
assertNotNull(pool);
assertFalse("Should be started", pool.isShutdown());
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterWithCustomThreadPoolExecutorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterWithCustomThreadPoolExecutorTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterWithCustomThreadPoolExecutorTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterWithCustomThreadPoolExecutorTest.java Wed Jan 23 15:26:07 2013
@@ -27,7 +27,7 @@ public class SpringSplitterWithCustomThr
@Override
protected ThreadPoolExecutor getThreadPoolExecutor() {
- return context.getRegistry().lookup("myThreadPoolExecutor", ThreadPoolExecutor.class);
+ return context.getRegistry().lookupByNameAndType("myThreadPoolExecutor", ThreadPoolExecutor.class);
}
protected CamelContext createCamelContext() throws Exception {
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentLoadStoreTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentLoadStoreTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentLoadStoreTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentLoadStoreTest.java Wed Jan 23 15:26:07 2013
@@ -55,7 +55,7 @@ public class FileConsumerIdempotentLoadS
super.setUp();
// add a file to the repo
- repo = context.getRegistry().lookup("fileStore", IdempotentRepository.class);
+ repo = context.getRegistry().lookupByNameAndType("fileStore", IdempotentRepository.class);
}
public void testIdempotentLoad() throws Exception {
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentTest.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentTest.java Wed Jan 23 15:26:07 2013
@@ -41,7 +41,7 @@ public class FileConsumerIdempotentTest
deleteDirectory("target/fileidempotent");
super.setUp();
- repo = context.getRegistry().lookup("fileStore", IdempotentRepository.class);
+ repo = context.getRegistry().lookupByNameAndType("fileStore", IdempotentRepository.class);
}
Modified: camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateStoreAsText.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateStoreAsText.java?rev=1437464&r1=1437463&r2=1437464&view=diff
==============================================================================
--- camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateStoreAsText.java (original)
+++ camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateStoreAsText.java Wed Jan 23 15:26:07 2013
@@ -47,7 +47,7 @@ public class JdbcAggregateStoreAsText ex
super.postProcessTest();
repo = applicationContext.getBean("repo3", JdbcAggregationRepository.class);
- dataSource = context.getRegistry().lookup("dataSource3", DataSource.class);
+ dataSource = context.getRegistry().lookupByNameAndType("dataSource3", DataSource.class);
jdbcTemplate = new JdbcTemplate(dataSource);
jdbcTemplate.afterPropertiesSet();
}