Author: dkulp
Date: Mon Dec 5 20:37:55 2011
New Revision: 1210613
URL: http://svn.apache.org/viewvc?rev=1210613&view=rev
Log:
Fix a bunch of warnings in eclipse
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderTest.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java
camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java
camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBlueprintEndpoint.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBlueprintEndpoint.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpoint.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/ConverterTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanBusSettingTest.java
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/tracing/TracingTestBase.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java?rev=1210613&r1=1210612&r2=1210613&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java
Mon Dec 5 20:37:55 2011
@@ -171,6 +171,7 @@ public abstract class AbstractCamelInvoc
}
}
+ @SuppressWarnings("deprecation")
protected static synchronized ExecutorService
getExecutorService(CamelContext context) {
// CamelContext will shutdown thread pool when it shutdown so we can
// lazy create it on demand
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderTest.java?rev=1210613&r1=1210612&r2=1210613&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderTest.java
Mon Dec 5 20:37:55 2011
@@ -863,7 +863,7 @@ public class NotifyBuilderTest extends C
public void testOneNonAbstractPredicate() throws Exception {
try {
- NotifyBuilder notify = new NotifyBuilder(context)
+ new NotifyBuilder(context)
.wereSentTo("mock:foo")
.create();
fail("Should throw exception");
Modified:
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java?rev=1210613&r1=1210612&r2=1210613&view=diff
==============================================================================
---
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java
(original)
+++
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java
Mon Dec 5 20:37:55 2011
@@ -70,7 +70,6 @@ public class BlueprintContainerRegistry
public static <T> Map<String, T> lookupByType(BlueprintContainer
blueprintContainer, Class<T> type) {
Bundle bundle = (Bundle)
blueprintContainer.getComponentInstance("blueprintBundle");
Map<String, T> objects = new LinkedHashMap<String, T>();
- @SuppressWarnings("unchecked")
Set<String> ids = blueprintContainer.getComponentIds();
for (String id : ids) {
try {
Modified:
camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java?rev=1210613&r1=1210612&r2=1210613&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java
(original)
+++
camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java
Mon Dec 5 20:37:55 2011
@@ -47,7 +47,7 @@ import org.apache.cxf.transport.Conduit;
import org.apache.cxf.transport.ConduitInitiator;
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.MessageObserver;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
Modified:
camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java?rev=1210613&r1=1210612&r2=1210613&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java
(original)
+++
camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java
Mon Dec 5 20:37:55 2011
@@ -31,7 +31,7 @@ import org.apache.cxf.transport.ConduitI
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Before;
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBlueprintEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBlueprintEndpoint.java?rev=1210613&r1=1210612&r2=1210613&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBlueprintEndpoint.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBlueprintEndpoint.java
Mon Dec 5 20:37:55 2011
@@ -37,7 +37,7 @@ public class CxfBlueprintEndpoint extend
private BlueprintCamelContext blueprintCamelContext;
public CxfBlueprintEndpoint(String address, BundleContext context) {
- super(address);
+ super(address, (CxfComponent)null);
bundleContext = context;
}
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=1210613&r1=1210612&r2=1210613&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
Mon Dec 5 20:37:55 2011
@@ -153,11 +153,13 @@ public class CxfEndpoint extends Default
setAddress(remaining);
}
+ @Deprecated
public CxfEndpoint(String remaining, CamelContext context) {
super(remaining, context);
setAddress(remaining);
}
+ @Deprecated
public CxfEndpoint(String remaining) {
super(remaining);
setAddress(remaining);
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java?rev=1210613&r1=1210612&r2=1210613&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java
Mon Dec 5 20:37:55 2011
@@ -42,10 +42,6 @@ public class CxfSpringEndpoint extends C
private String beanId;
private ApplicationContext applicationContext;
-
- public CxfSpringEndpoint(CamelContext context, String address) throws
Exception {
- super(address, context);
- }
public CxfSpringEndpoint(CxfComponent component, String address) throws
Exception {
super(address, component);
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBlueprintEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBlueprintEndpoint.java?rev=1210613&r1=1210612&r2=1210613&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBlueprintEndpoint.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBlueprintEndpoint.java
Mon Dec 5 20:37:55 2011
@@ -17,6 +17,7 @@
package org.apache.camel.component.cxf.jaxrs;
import org.apache.camel.CamelContext;
+import org.apache.camel.Component;
import org.apache.camel.blueprint.BlueprintCamelContext;
import org.apache.camel.component.cxf.blueprint.BlueprintSupport;
import org.apache.camel.component.cxf.blueprint.RsClientBlueprintBean;
@@ -33,8 +34,8 @@ public class CxfRsBlueprintEndpoint exte
private BundleContext bundleContext;
private BlueprintCamelContext blueprintCamelContext;
- public CxfRsBlueprintEndpoint(CamelContext camelContext,
AbstractJAXRSFactoryBean bean) {
- super(bean.getAddress(), camelContext);
+ public CxfRsBlueprintEndpoint(Component comp, AbstractJAXRSFactoryBean
bean) {
+ super(bean.getAddress(), comp);
this.bean = bean;
BlueprintSupport support = (BlueprintSupport)bean;
setBlueprintContainer(support.getBlueprintContainer());
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java?rev=1210613&r1=1210612&r2=1210613&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
Mon Dec 5 20:37:55 2011
@@ -54,9 +54,9 @@ public class CxfRsComponent extends Head
AbstractJAXRSFactoryBean bean =
CamelContextHelper.mandatoryLookup(getCamelContext(), beanId,
AbstractJAXRSFactoryBean.class);
if (bean instanceof BlueprintSupport) {
- answer = new CxfRsBlueprintEndpoint(this.getCamelContext(),
bean);
+ answer = new CxfRsBlueprintEndpoint(this, bean);
} else {
- answer = new CxfRsSpringEndpoint(this.getCamelContext(), bean);
+ answer = new CxfRsSpringEndpoint(this, bean);
}
// Apply Spring bean properties (including # notation referenced
bean). Note that the
// Spring bean properties values can be overridden by property
defined in URI query.
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java?rev=1210613&r1=1210612&r2=1210613&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
Mon Dec 5 20:37:55 2011
@@ -60,6 +60,7 @@ public class CxfRsEndpoint extends Defau
private boolean isSetDefaultBus;
+ @Deprecated
public CxfRsEndpoint(String endpointUri, CamelContext camelContext) {
super(endpointUri, camelContext);
setAddress(endpointUri);
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpoint.java?rev=1210613&r1=1210612&r2=1210613&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpoint.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpoint.java
Mon Dec 5 20:37:55 2011
@@ -18,6 +18,7 @@
package org.apache.camel.component.cxf.jaxrs;
import org.apache.camel.CamelContext;
+import org.apache.camel.Component;
import org.apache.camel.component.cxf.spring.SpringJAXRSClientFactoryBean;
import org.apache.camel.component.cxf.spring.SpringJAXRSServerFactoryBean;
import org.apache.camel.spring.SpringCamelContext;
@@ -33,8 +34,8 @@ public class CxfRsSpringEndpoint extends
private String beanId;
- public CxfRsSpringEndpoint(CamelContext context, AbstractJAXRSFactoryBean
bean) throws Exception {
- super(bean.getAddress(), context);
+ public CxfRsSpringEndpoint(Component component, AbstractJAXRSFactoryBean
bean) throws Exception {
+ super(bean.getAddress(), component);
init(bean);
}
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/ConverterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/ConverterTest.java?rev=1210613&r1=1210612&r2=1210613&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/ConverterTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/ConverterTest.java
Mon Dec 5 20:37:55 2011
@@ -27,7 +27,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.DefaultExchange;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanBusSettingTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanBusSettingTest.java?rev=1210613&r1=1210612&r2=1210613&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanBusSettingTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanBusSettingTest.java
Mon Dec 5 20:37:55 2011
@@ -59,15 +59,5 @@ public class CxfEndpointBeanBusSettingTe
}
-
- @SuppressWarnings("unchecked")
- private <T> T getInterceptor(List<Interceptor<? extends Message>> list,
Class<T> clz) {
- for (Interceptor<? extends Message> i : list) {
- if (clz.isInstance(i)) {
- return (T)i;
- }
- }
- return null;
- }
}
Modified:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java?rev=1210613&r1=1210612&r2=1210613&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
(original)
+++
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
Mon Dec 5 20:37:55 2011
@@ -157,7 +157,7 @@ public class JettyContentExchange extend
public String getUrl() {
String params =
getRequestFields().getStringField(HttpHeaders.CONTENT_ENCODING);
- return getScheme() + "//" + getAddress().toString() + getURI() +
(params != null ? "?" + params : "");
+ return getScheme() + "//" + getAddress().toString() + getRequestURI()
+ (params != null ? "?" + params : "");
}
protected void doTaskCompleted() {
Modified:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java?rev=1210613&r1=1210612&r2=1210613&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
(original)
+++
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
Mon Dec 5 20:37:55 2011
@@ -206,7 +206,7 @@ public class JettyHttpProducer extends D
}
// okay we need to add the query string to the URI so we need to
juggle a bit with the parameters
- String uri = httpExchange.getURI();
+ String uri = httpExchange.getRequestURI();
Map parameters = URISupport.parseParameters(new URI(uri));
parameters.putAll(URISupport.parseQuery(queryString));
@@ -216,7 +216,7 @@ public class JettyHttpProducer extends D
}
if (!parameters.isEmpty()) {
uri = uri + "?" + URISupport.createQueryString(parameters);
- httpExchange.setURI(uri);
+ httpExchange.setRequestURI(uri);
}
}
Modified:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/tracing/TracingTestBase.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/tracing/TracingTestBase.java?rev=1210613&r1=1210612&r2=1210613&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/tracing/TracingTestBase.java
(original)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/tracing/TracingTestBase.java
Mon Dec 5 20:37:55 2011
@@ -27,7 +27,7 @@ public abstract class TracingTestBase ex
protected List<StringBuilder> getTracedMessages() {
Tracer tracer = (Tracer) this.applicationContext.getBean("tracer");
- TraceHandlerTestHandler handler = (TraceHandlerTestHandler)
tracer.getTraceHandler();
+ TraceHandlerTestHandler handler = (TraceHandlerTestHandler)
tracer.getTraceHandlers().get(0);
return handler.getEventMessages();
}
