Author: hadrian
Date: Fri Apr 29 16:55:57 2011
New Revision: 1097885
URL: http://svn.apache.org/viewvc?rev=1097885&view=rev
Log:
CAMEL-3889. Patch applied with thanks to Dan Kulp
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProxyBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/CamelProxyFactoryBean.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProxyBuilder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProxyBuilder.java?rev=1097885&r1=1097884&r2=1097885&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProxyBuilder.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProxyBuilder.java
Fri Apr 29 16:55:57 2011
@@ -64,9 +64,10 @@ public final class ProxyBuilder {
* @return the proxied bean
* @throws Exception is thrown if error creating the proxy
*/
- public <T> T build(Class<T>... interfaceClasses) throws Exception {
+ @SuppressWarnings("unchecked")
+ public <T> T build(Class<?>... interfaceClasses) throws Exception {
ObjectHelper.notNull(endpoint, "endpoint");
- return ProxyHelper.createProxy(endpoint, interfaceClasses);
+ return (T)ProxyHelper.createProxy(endpoint, interfaceClasses);
}
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java?rev=1097885&r1=1097884&r2=1097885&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
Fri Apr 29 16:55:57 2011
@@ -58,7 +58,7 @@ public final class ProxyHelper {
* Creates a Proxy which sends the exchange to the endpoint.
*/
@SuppressWarnings("unchecked")
- public static <T> T createProxy(Endpoint endpoint, ClassLoader cl,
Class<T>... interfaceClasses) throws Exception {
+ public static <T> T createProxy(Endpoint endpoint, ClassLoader cl,
Class<?>... interfaceClasses) throws Exception {
return (T) createProxy(endpoint, cl, interfaceClasses,
createMethodInfoCache(endpoint));
}
@@ -66,7 +66,8 @@ public final class ProxyHelper {
/**
* Creates a Proxy which sends the exchange to the endpoint.
*/
- public static <T> T createProxy(Endpoint endpoint, Class<T>...
interfaceClasses) throws Exception {
+ @SuppressWarnings("unchecked")
+ public static <T> T createProxy(Endpoint endpoint, Class<?>...
interfaceClasses) throws Exception {
return (T) createProxy(endpoint, getClassLoader(interfaceClasses),
interfaceClasses);
}
@@ -74,7 +75,7 @@ public final class ProxyHelper {
* Creates a Proxy which sends the exchange to the endpoint.
*/
@SuppressWarnings("unchecked")
- public static <T> T createProxy(Endpoint endpoint, Producer producer,
Class<T>... interfaceClasses) throws Exception {
+ public static <T> T createProxy(Endpoint endpoint, Producer producer,
Class<?>... interfaceClasses) throws Exception {
return (T) createProxyObject(endpoint, producer,
getClassLoader(interfaceClasses), interfaceClasses,
createMethodInfoCache(endpoint));
}
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=1097885&r1=1097884&r2=1097885&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
Fri Apr 29 16:55:57 2011
@@ -44,7 +44,6 @@ public class CamelProxyFactoryBean exten
private Producer producer;
@Override
- @SuppressWarnings("unchecked")
public void afterPropertiesSet() {
if (endpoint == null) {
if (camelContext == null && camelContextId != null) {