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 2008/11/13 20:19:07 UTC
svn commit: r713796 - in /activemq/camel/trunk:
camel-core/src/main/java/org/apache/camel/impl/
camel-core/src/main/java/org/apache/camel/util/
components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/
components/camel-jdbc/src/main/ja...
Author: davsclaus
Date: Thu Nov 13 11:19:06 2008
New Revision: 713796
URL: http://svn.apache.org/viewvc?rev=713796&view=rev
Log:
CAMEL-895: Using mandatoryLookup instead of doing the test and throw exception if not found
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileComponent.java
activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcComponent.java
activemq/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcOptionsTest.java
activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
activemq/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java?rev=713796&r1=713795&r2=713796&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java Thu Nov 13 11:19:06 2008
@@ -242,7 +242,7 @@
/**
* Look up the given named bean in the {@link Registry} on the
- * {@link CamelContext} or throws
+ * {@link CamelContext} or throws exception if not found.
*/
public Object mandatoryLookup(String name) {
return CamelContextHelper.mandatoryLookup(getCamelContext(), name);
@@ -250,7 +250,7 @@
/**
* Look up the given named bean of the given type in the {@link Registry} on the
- * {@link CamelContext}
+ * {@link CamelContext} or throws exception if not found.
*/
public <T> T mandatoryLookup(String name, Class<T> beanType) {
return CamelContextHelper.mandatoryLookup(getCamelContext(), name, beanType);
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java?rev=713796&r1=713795&r2=713796&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java Thu Nov 13 11:19:06 2008
@@ -22,7 +22,6 @@
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.NoSuchEndpointException;
import org.apache.camel.spi.Injector;
@@ -32,12 +31,14 @@
import static org.apache.camel.util.ObjectHelper.isNotNullAndNonEmpty;
import static org.apache.camel.util.ObjectHelper.isNullOrBlank;
import static org.apache.camel.util.ObjectHelper.notNull;
+
/**
* A number of helper methods
*
* @version $Revision$
*/
public final class CamelContextHelper {
+
/**
* Utility classes should not have a public constructor.
*/
@@ -156,7 +157,7 @@
/**
* Look up the given named bean in the {@link Registry} on the
- * {@link CamelContext} or throws
+ * {@link CamelContext} or throws IllegalArgumentException if not found.
*/
public static Object mandatoryLookup(CamelContext context, String name) {
Object answer = lookup(context, name);
@@ -166,7 +167,7 @@
/**
* Look up the given named bean of the given type in the {@link Registry} on the
- * {@link CamelContext}
+ * {@link CamelContext} or throws IllegalArgumentException if not found.
*/
public static <T> T mandatoryLookup(CamelContext context, String name, Class<T> beanType) {
T answer = lookup(context, name, beanType);
Modified: activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileComponent.java?rev=713796&r1=713795&r2=713796&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileComponent.java (original)
+++ activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileComponent.java Thu Nov 13 11:19:06 2008
@@ -77,10 +77,7 @@
// lookup client config in registry if provided
String ref = getAndRemoveParameter(parameters, "ftpClientConfig", String.class);
if (ref != null) {
- FTPClientConfig ftpClientConfig = this.getCamelContext().getRegistry().lookup(ref, FTPClientConfig.class);
- if (ftpClientConfig == null) {
- throw new IllegalArgumentException("FTPClientConfig " + ref + " not found in registry.");
- }
+ FTPClientConfig ftpClientConfig = mandatoryLookup(ref, FTPClientConfig.class);
endpoint.getConfiguration().setFtpClientConfig(ftpClientConfig);
}
}
Modified: activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcComponent.java?rev=713796&r1=713795&r2=713796&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcComponent.java (original)
+++ activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcComponent.java Thu Nov 13 11:19:06 2008
@@ -41,14 +41,10 @@
DataSource dataSource;
if (ds != null) {
- // use data source set by setter
+ // perfer to use datasource set by setter
dataSource = ds;
} else {
- // lookup in registry instead
- dataSource = getCamelContext().getRegistry().lookup(remaining, DataSource.class);
- if (dataSource == null) {
- throw new IllegalArgumentException("DataSource " + remaining + " not found in registry");
- }
+ dataSource = mandatoryLookup(remaining, DataSource.class);
}
JdbcEndpoint jdbc = new JdbcEndpoint(uri, this, dataSource);
Modified: activemq/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcOptionsTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcOptionsTest.java?rev=713796&r1=713795&r2=713796&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcOptionsTest.java (original)
+++ activemq/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcOptionsTest.java Thu Nov 13 11:19:06 2008
@@ -53,7 +53,8 @@
template.sendBody("jdbc:xxx", "Hello World");
fail("Should have thrown a ResolveEndpointFailedException");
} catch (ResolveEndpointFailedException e) {
- assertEquals("DataSource xxx not found in registry", e.getCause().getMessage());
+ assertEquals("registry entry called xxx of type javax.sql.DataSource must be specified",
+ e.getCause().getMessage());
}
}
Modified: activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java?rev=713796&r1=713795&r2=713796&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java Thu Nov 13 11:19:06 2008
@@ -86,10 +86,6 @@
@Override
protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Creating MinaEndpoint from uri: " + uri);
- }
-
setProperties(this, parameters);
URI u = new URI(remaining);
@@ -303,10 +299,7 @@
protected ProtocolCodecFactory getCodecFactory(String type, String codec) {
ProtocolCodecFactory codecFactory = null;
if (codec != null) {
- codecFactory = getCamelContext().getRegistry().lookup(codec, ProtocolCodecFactory.class);
- if (codecFactory == null) {
- throw new IllegalArgumentException("Codec " + codec + " not found in registry.");
- }
+ codecFactory = mandatoryLookup(codec, ProtocolCodecFactory.class);
if (LOG.isDebugEnabled()) {
LOG.debug(type + ": Using custom CodecFactory: " + codecFactory);
}
Modified: activemq/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java?rev=713796&r1=713795&r2=713796&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java (original)
+++ activemq/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java Thu Nov 13 11:19:06 2008
@@ -41,10 +41,7 @@
protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception {
String dataSourceRef = getAndRemoveParameter(parameters, "dataSourceRef", String.class);
if (dataSourceRef != null) {
- dataSource = getCamelContext().getRegistry().lookup(dataSourceRef, DataSource.class);
- if (dataSource == null) {
- throw new IllegalArgumentException("DataSource " + dataSourceRef + " not found in registry");
- }
+ dataSource = mandatoryLookup(dataSourceRef, DataSource.class);
}
return new SqlEndpoint(uri, remaining.replaceAll("#", "?"), this, dataSource, parameters);