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 2013/11/19 04:06:26 UTC
[6/6] git commit: Polish the code with suggestion from Babak
Polish the code with suggestion from Babak
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b5a726c4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b5a726c4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b5a726c4
Branch: refs/heads/camel-2.11.x
Commit: b5a726c4098bb3bf9f6acd4bcee2db4c96fcc51d
Parents: d7d90d8
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Nov 19 10:44:08 2013 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Nov 19 11:05:46 2013 +0800
----------------------------------------------------------------------
.../java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java | 2 +-
.../org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b5a726c4/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
index 4e736fd..1e1296b 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
@@ -393,7 +393,7 @@ public class CxfRsEndpoint extends DefaultEndpoint implements HeaderFilterStrate
return entityProviders;
}
- public void setProviders(List<? extends Object> providers) {
+ public void setProviders(List<?> providers) {
this.entityProviders.addAll(providers);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/b5a726c4/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java
index 5156c77..0534f6c 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java
@@ -80,8 +80,7 @@ public class CxfRsEndpointTest extends CamelTestSupport {
CxfRsComponent component = new CxfRsComponent(context);
CxfRsEndpoint endpoint = (CxfRsEndpoint)component.createEndpoint(endpointUri);
- @SuppressWarnings("rawtypes")
- JSONProvider jsonProvider = new JSONProvider();
+ JSONProvider<?> jsonProvider = new JSONProvider<Object>();
jsonProvider.setDropRootElement(true);
jsonProvider.setSupportUnwrapped(true);
endpoint.setProvider(jsonProvider);