Updated Branches: refs/heads/master cb9460242 -> 8f9aba013
Polished. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8f9aba01 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8f9aba01 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8f9aba01 Branch: refs/heads/master Commit: 8f9aba013b8cc8d3f31934764ec6c61d72dc459a Parents: cb94602 Author: Babak Vahdat <bvah...@apache.org> Authored: Fri Nov 15 09:56:57 2013 +0100 Committer: Babak Vahdat <bvah...@apache.org> Committed: Fri Nov 15 09:56:57 2013 +0100 ---------------------------------------------------------------------- .../apache/camel/component/cxf/CxfEndpoint.java | 26 +++++++++----------- .../apache/camel/component/cxf/CxfProducer.java | 1 - .../RawMessageWSDLGetInterceptor.java | 2 +- .../apache/camel/component/mina/MinaHelper.java | 2 +- .../camel/component/mina2/Mina2Helper.java | 2 +- 5 files changed, 14 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/8f9aba01/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java index c63c1a2..0c3984e 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java @@ -141,16 +141,11 @@ public class CxfEndpoint extends DefaultEndpoint implements HeaderFilterStrategy private boolean skipFaultLogging; private boolean mergeProtocolHeaders; private Map<String, Object> properties; - private List<Interceptor<? extends Message>> in - = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>(); - private List<Interceptor<? extends Message>> out - = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>(); - private List<Interceptor<? extends Message>> outFault - = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>(); - private List<Interceptor<? extends Message>> inFault - = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>(); - private List<AbstractFeature> features - = new ModCountCopyOnWriteArrayList<AbstractFeature>(); + private List<Interceptor<? extends Message>> in = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>(); + private List<Interceptor<? extends Message>> out = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>(); + private List<Interceptor<? extends Message>> outFault = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>(); + private List<Interceptor<? extends Message>> inFault = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>(); + private List<AbstractFeature> features = new ModCountCopyOnWriteArrayList<AbstractFeature>(); @SuppressWarnings("rawtypes") private List<Handler> handlers; @@ -164,6 +159,9 @@ public class CxfEndpoint extends DefaultEndpoint implements HeaderFilterStrategy private CxfEndpointConfigurer configurer; + public CxfEndpoint() { + } + public CxfEndpoint(String remaining, CxfComponent cxfComponent) { super(remaining, cxfComponent); setAddress(remaining); @@ -181,9 +179,6 @@ public class CxfEndpoint extends DefaultEndpoint implements HeaderFilterStrategy setAddress(remaining); } - public CxfEndpoint() { - } - public CxfEndpoint copy() { try { return (CxfEndpoint)this.clone(); @@ -663,7 +658,7 @@ public class CxfEndpoint extends DefaultEndpoint implements HeaderFilterStrategy public void setServiceClass(String type) throws ClassNotFoundException { if (ObjectHelper.isEmpty(type)) { - throw new IllegalArgumentException("The serviceClass option should not be set with Emptye String."); + throw new IllegalArgumentException("The serviceClass option can neither be null nor an empty String."); } serviceClass = ClassLoaderUtils.loadClass(resolvePropertyPlaceholders(type), getClass()); } @@ -1044,7 +1039,8 @@ public class CxfEndpoint extends DefaultEndpoint implements HeaderFilterStrategy return features; } - public void setHandlers(@SuppressWarnings("rawtypes") List<Handler> h) { + @SuppressWarnings("rawtypes") + public void setHandlers(List<Handler> h) { handlers = h; } http://git-wip-us.apache.org/repos/asf/camel/blob/8f9aba01/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java index 3f1ec4c..fbaf780 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java @@ -273,7 +273,6 @@ public class CxfProducer extends DefaultProducer implements AsyncProcessor { /** * Get the parameters for the web service operation */ - @SuppressWarnings("deprecation") private Object[] getParams(CxfEndpoint endpoint, Exchange exchange) throws org.apache.camel.InvalidPayloadException { http://git-wip-us.apache.org/repos/asf/camel/blob/8f9aba01/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java index 41a30d1..e102971 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java @@ -77,7 +77,7 @@ public class RawMessageWSDLGetInterceptor extends AbstractPhaseInterceptor<Messa while (iterator.hasNext()) { Interceptor<? extends Message> inInterceptor = iterator.next(); if (inInterceptor instanceof AbstractPhaseInterceptor) { - AbstractPhaseInterceptor interceptor = (AbstractPhaseInterceptor)inInterceptor; + AbstractPhaseInterceptor<?> interceptor = (AbstractPhaseInterceptor<?>)inInterceptor; if (interceptor.getPhase().equals(Phase.PREPARE_SEND) || interceptor.getPhase().equals(Phase.PRE_STREAM)) { // just make sure we keep the right interceptors http://git-wip-us.apache.org/repos/asf/camel/blob/8f9aba01/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaHelper.java ---------------------------------------------------------------------- diff --git a/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaHelper.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaHelper.java index f814995..1607ef0 100644 --- a/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaHelper.java +++ b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaHelper.java @@ -35,7 +35,7 @@ public final class MinaHelper { } /** - * Asynchronous writes the given body to MINA session. Will wait at most for + * Asynchronously writes the given body to MINA session. Will wait at most for * 10 seconds until the body has been written. * * @param session the MINA session http://git-wip-us.apache.org/repos/asf/camel/blob/8f9aba01/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java ---------------------------------------------------------------------- diff --git a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java b/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java index cc25da1..bc3016e 100644 --- a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java +++ b/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java @@ -35,7 +35,7 @@ public final class Mina2Helper { } /** - * Asynchronous writes the given body to MINA session. Will wait at most for + * Asynchronously writes the given body to MINA session. Will wait at most for * 10 seconds until the body has been written. * * @param session the MINA session
