You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2012/07/12 15:18:00 UTC
svn commit: r1360663 - in /camel/branches/camel-2.10.x: ./
components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/
components/camel-cxf/src/test/java/org/apache/camel/component/cxf/
components/camel-cxf/src/test/java/org/apache/camel/c...
Author: ningjiang
Date: Thu Jul 12 13:17:59 2012
New Revision: 1360663
URL: http://svn.apache.org/viewvc?rev=1360663&view=rev
Log:
Merged revisions 1360583 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1360583 | ningjiang | 2012-07-12 16:50:19 +0800 (Thu, 12 Jul 2012) | 1 line
Fixed the CS errors of camel-cxf components
........
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CamelResourceProvider.java
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SubResourceClassInvocationHandler.java
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadBareSoapTest.java
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1360583
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jul 12 13:17:59 2012
@@ -1 +1 @@
-/camel/trunk:1-1358964,1359013,1359197,1359226,1359265,1359341,1359383,1360031,1360241,1360339,1360525-1360527,1360581
+/camel/trunk:1-1358964,1359013,1359197,1359226,1359265,1359341,1359383,1360031,1360241,1360339,1360525-1360527,1360581,1360583
Modified: camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CamelResourceProvider.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CamelResourceProvider.java?rev=1360663&r1=1360662&r2=1360663&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CamelResourceProvider.java (original)
+++ camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CamelResourceProvider.java Thu Jul 12 13:17:59 2012
@@ -41,10 +41,8 @@ public class CamelResourceProvider imple
result = provider.getInstance(m);
} else {
// create the instance with the invoker
- result = Proxy.newProxyInstance(
- clazz.getClassLoader(),
- new Class[]{clazz},
- new SubResourceClassInvocationHandler());
+ result = Proxy.newProxyInstance(clazz.getClassLoader(), new Class[] {clazz},
+ new SubResourceClassInvocationHandler());
}
return result;
}
Modified: camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java?rev=1360663&r1=1360662&r2=1360663&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java (original)
+++ camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java Thu Jul 12 13:17:59 2012
@@ -142,8 +142,8 @@ public class CxfRsEndpoint extends Defau
if (getResourceClasses() != null) {
List<Class<?>> res = CastUtils.cast(getResourceClasses());
// setup the resource providers
- for(Class<?>clazz : res) {
- sfb.setResourceProvider(clazz, new CamelResourceProvider(clazz));
+ for (Class<?> clazz : res) {
+ sfb.setResourceProvider(clazz, new CamelResourceProvider(clazz));
}
sfb.setResourceClasses(res);
}
Modified: camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SubResourceClassInvocationHandler.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SubResourceClassInvocationHandler.java?rev=1360663&r1=1360662&r2=1360663&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SubResourceClassInvocationHandler.java (original)
+++ camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SubResourceClassInvocationHandler.java Thu Jul 12 13:17:59 2012
@@ -25,27 +25,24 @@ import org.apache.cxf.jaxrs.utils.Resour
// This class only return the sub class instance
public class SubResourceClassInvocationHandler implements InvocationHandler {
- @Override
- public Object invoke(Object proxy, Method method, Object[] parameters)
- throws Throwable {
- Object result = null;
- Class<?> returnType = method.getReturnType();
- System.out.println("returnType class " + returnType);
- if (!returnType.isAssignableFrom(Void.class)) {
- // create a instance to return
- if (returnType.isInterface()) {
- // create a new proxy for it
- result = Proxy.newProxyInstance(
- returnType.getClassLoader(),
- new Class[]{returnType},
- new SubResourceClassInvocationHandler());
- } else {
- // get the constructor and create a new instance
- Constructor<?> c = ResourceUtils.findResourceConstructor(returnType, true);
- result = c.newInstance(new Object[]{});
- }
- }
- return result;
- }
+ @Override
+ public Object invoke(Object proxy, Method method, Object[] parameters) throws Throwable {
+ Object result = null;
+ Class<?> returnType = method.getReturnType();
+ System.out.println("returnType class " + returnType);
+ if (!returnType.isAssignableFrom(Void.class)) {
+ // create a instance to return
+ if (returnType.isInterface()) {
+ // create a new proxy for it
+ result = Proxy.newProxyInstance(returnType.getClassLoader(), new Class[] {returnType},
+ new SubResourceClassInvocationHandler());
+ } else {
+ // get the constructor and create a new instance
+ Constructor<?> c = ResourceUtils.findResourceConstructor(returnType, true);
+ result = c.newInstance(new Object[] {});
+ }
+ }
+ return result;
+ }
}
Modified: camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadBareSoapTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadBareSoapTest.java?rev=1360663&r1=1360662&r2=1360663&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadBareSoapTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadBareSoapTest.java Thu Jul 12 13:17:59 2012
@@ -75,7 +75,7 @@ public class CxfPayLoadBareSoapTest exte
@WebService
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- public static interface BareSoapService {
+ public interface BareSoapService {
void doSomething();
}
Modified: camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java?rev=1360663&r1=1360662&r2=1360663&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java (original)
+++ camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java Thu Jul 12 13:17:59 2012
@@ -29,10 +29,10 @@ public interface CustomerServiceResource
@GET
@Path("/customers/{id}/")
- public Customer getCustomer(@PathParam("id") String id);
+ Customer getCustomer(@PathParam("id") String id);
@PUT
@Path("/customers/")
- public Response updateCustomer(Customer customer);
+ Response updateCustomer(Customer customer);
}
// END SNIPPET: example