You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2014/08/14 17:28:46 UTC
[1/3] git commit: Minor update to start making things easier for
Jetty9
Repository: camel
Updated Branches:
refs/heads/master a6fce3d99 -> d5253916c
Minor update to start making things easier for Jetty9
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/22f62928
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/22f62928
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/22f62928
Branch: refs/heads/master
Commit: 22f629287623f6d78625ef264281a2f4f21eb18f
Parents: 4c69278
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Aug 14 09:09:08 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Aug 14 09:09:24 2014 -0400
----------------------------------------------------------------------
.../camel/component/jetty/JettyHttpComponent.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/22f62928/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index 4f0e5b8..0c51eb6d 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -486,8 +486,8 @@ public class JettyHttpComponent extends HttpComponent implements RestConsumerFac
return sslKeystore;
}
- protected SslSelectChannelConnector getSslSocketConnector(JettyHttpEndpoint endpoint) throws Exception {
- SslSelectChannelConnector answer = null;
+ protected Connector getSslSocketConnector(JettyHttpEndpoint endpoint) throws Exception {
+ Connector answer = null;
if (sslSocketConnectors != null) {
answer = sslSocketConnectors.get(endpoint.getPort());
}
@@ -497,7 +497,7 @@ public class JettyHttpComponent extends HttpComponent implements RestConsumerFac
return answer;
}
- protected SslSelectChannelConnector createSslSocketConnector(JettyHttpEndpoint endpoint) throws Exception {
+ protected Connector createSslSocketConnector(JettyHttpEndpoint endpoint) throws Exception {
SslSelectChannelConnector answer = null;
// Note that this was set on the endpoint when it was constructed. It was
@@ -642,8 +642,8 @@ public class JettyHttpComponent extends HttpComponent implements RestConsumerFac
sslSocketConnectors = connectors;
}
- public SelectChannelConnector getSocketConnector(int port) throws Exception {
- SelectChannelConnector answer = null;
+ public Connector getSocketConnector(int port) throws Exception {
+ Connector answer = null;
if (socketConnectors != null) {
answer = socketConnectors.get(port);
}
@@ -653,7 +653,7 @@ public class JettyHttpComponent extends HttpComponent implements RestConsumerFac
return answer;
}
- protected SelectChannelConnector createSocketConnector() throws Exception {
+ protected Connector createSocketConnector() throws Exception {
SelectChannelConnector answer = new SelectChannelConnector();
if (getSocketConnectorProperties() != null) {
// must copy the map otherwise it will be deleted
[2/3] git commit: Force the current websocket stuff to use Jetty8 for
now.
Posted by dk...@apache.org.
Force the current websocket stuff to use Jetty8 for now.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4c692780
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4c692780
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4c692780
Branch: refs/heads/master
Commit: 4c6927800df3a8dcdf8bb4ba07ec72d73d04d208
Parents: a6fce3d
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Aug 13 13:02:07 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Aug 14 09:09:24 2014 -0400
----------------------------------------------------------------------
components/camel-ahc-ws/pom.xml | 5 +++--
components/camel-atmosphere-websocket/pom.xml | 5 +++--
components/camel-web-standalone/pom.xml | 3 ++-
components/camel-web/pom.xml | 2 +-
components/camel-websocket/pom.xml | 5 ++++-
parent/pom.xml | 4 +++-
6 files changed, 16 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4c692780/components/camel-ahc-ws/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-ahc-ws/pom.xml b/components/camel-ahc-ws/pom.xml
index d6f80f3..d4e3b1c 100644
--- a/components/camel-ahc-ws/pom.xml
+++ b/components/camel-ahc-ws/pom.xml
@@ -68,16 +68,17 @@
<scope>test</scope>
</dependency>
- <!-- Jetty for testing-->
+ <!-- Jetty8 for testing-->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-websocket</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty8-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
+ <version>${jetty8-version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/4c692780/components/camel-atmosphere-websocket/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml
index 3060d3f..f37519c 100644
--- a/components/camel-atmosphere-websocket/pom.xml
+++ b/components/camel-atmosphere-websocket/pom.xml
@@ -96,16 +96,17 @@
<scope>test</scope>
</dependency>
- <!-- Jetty for testing-->
+ <!-- Jetty 8 for testing-->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-websocket</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty8-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
+ <version>${jetty8-version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/4c692780/components/camel-web-standalone/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-web-standalone/pom.xml b/components/camel-web-standalone/pom.xml
index 4f3c82d..16fa9b3 100755
--- a/components/camel-web-standalone/pom.xml
+++ b/components/camel-web-standalone/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<!-- not org.eclipse.jetty at present -->
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>${jetty-runner-groupId}</groupId>
<artifactId>jetty-runner</artifactId>
<version>${jetty-version}</version>
</dependency>
@@ -52,6 +52,7 @@
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/camel/blob/4c692780/components/camel-web/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-web/pom.xml b/components/camel-web/pom.xml
index 5520824..66d2fbc 100644
--- a/components/camel-web/pom.xml
+++ b/components/camel-web/pom.xml
@@ -252,7 +252,7 @@
<!-- mvn jetty:run -->
<plugin>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>${jetty-runner-groupId}</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<configuration>
<!--
http://git-wip-us.apache.org/repos/asf/camel/blob/4c692780/components/camel-websocket/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-websocket/pom.xml b/components/camel-websocket/pom.xml
index 7ab0507..951c5c2 100644
--- a/components/camel-websocket/pom.xml
+++ b/components/camel-websocket/pom.xml
@@ -54,19 +54,22 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-websocket</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty8-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
+ <version>${jetty8-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
+ <version>${jetty8-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jmx</artifactId>
+ <version>${jetty8-version}</version>
</dependency>
<!-- test dependencies -->
http://git-wip-us.apache.org/repos/asf/camel/blob/4c692780/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8066699..4a9d39f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -231,6 +231,7 @@
<jetty8-version>8.1.15.v20140411</jetty8-version>
<jetty9-version>9.2.2.v20140723</jetty9-version>
<jetty-version>${jetty8-version}</jetty-version>
+ <jetty-runner-groupId>org.mortbay.jetty</jetty-runner-groupId>
<jettison-version>1.3.5</jettison-version>
<jexcelapi-bundle-version>2.4.2_4</jexcelapi-bundle-version>
<jexcelapi-version>2.4.2</jexcelapi-version>
@@ -2609,7 +2610,7 @@
</dependencies>
</plugin>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>${jetty-runner-groupId}</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty-version}</version>
</plugin>
@@ -2867,6 +2868,7 @@
<id>jetty9</id>
<properties>
<jetty-version>${jetty9-version}</jetty-version>
+ <jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>
</properties>
</profile>
[3/3] git commit: Fix a BUNCH of eclipse warnings. Still a ton to go.
Posted by dk...@apache.org.
Fix a BUNCH of eclipse warnings. Still a ton to go.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d5253916
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d5253916
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d5253916
Branch: refs/heads/master
Commit: d5253916c76736fa97cd43c7d7140e9d6482ef8c
Parents: 22f6292
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Aug 14 11:28:03 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Aug 14 11:28:03 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/camel/builder/AdviceWithTasks.java | 13 ++++++-------
.../org/apache/camel/component/log/LogComponent.java | 3 ---
.../org/apache/camel/component/seda/SedaEndpoint.java | 4 +++-
.../org/apache/camel/impl/DefaultCamelContext.java | 1 -
.../java/org/apache/camel/impl/DefaultProducer.java | 1 +
.../org/apache/camel/impl/DefaultRestRegistry.java | 1 +
.../org/apache/camel/impl/InterceptSendToEndpoint.java | 2 ++
.../apache/camel/impl/SynchronousDelegateProducer.java | 1 +
.../apache/camel/impl/UriEndpointConfiguration.java | 12 ++++++------
.../impl/converter/BaseTypeConverterRegistry.java | 6 +++---
.../management/DefaultManagementMBeanAssembler.java | 2 +-
.../apache/camel/management/MBeanInfoAssembler.java | 5 +++--
.../management/mbean/ManagedTypeConverterRegistry.java | 4 ++--
.../apache/camel/model/rest/RestBindingDefinition.java | 2 +-
.../org/apache/camel/model/rest/VerbDefinition.java | 6 +++---
.../main/java/org/apache/camel/processor/Splitter.java | 3 ---
.../processor/ThrottlerRejectedExecutionException.java | 2 ++
.../org/apache/camel/processor/UnitOfWorkProducer.java | 1 +
.../aggregate/AggregationStrategyBeanAdapter.java | 2 +-
.../aggregate/AggregationStrategyBeanInfo.java | 8 +++++---
.../aggregate/AggregationStrategyMethodInfo.java | 11 +++++++----
.../camel/processor/binding/BindingException.java | 2 ++
.../camel/processor/interceptor/BacklogDebugger.java | 12 ++++--------
.../camel/processor/interceptor/DefaultChannel.java | 1 +
.../org/apache/camel/spi/TypeConverterRegistry.java | 2 +-
.../org/apache/camel/support/DefaultTimeoutMap.java | 2 +-
.../src/main/java/org/apache/camel/util/HostUtils.java | 4 ++--
.../camel/util/component/AbstractApiComponent.java | 2 +-
.../camel/util/component/AbstractApiProducer.java | 7 ++-----
.../org/apache/camel/util/component/ApiCollection.java | 1 -
.../apache/camel/util/component/ApiConsumerHelper.java | 2 +-
.../org/apache/camel/util/component/ApiMethod.java | 1 +
.../apache/camel/util/component/ApiMethodHelper.java | 8 ++++----
.../apache/camel/util/component/ApiMethodParser.java | 4 ++--
.../org/apache/camel/view/GraphGeneratorSupport.java | 1 -
.../org/apache/camel/component/box/BoxProducer.java | 1 -
.../camel/core/osgi/OsgiCamelContextPublisher.java | 11 ++++++-----
.../apache/camel/core/osgi/OsgiEventAdminNotifier.java | 6 +++---
.../org/apache/camel/core/osgi/OsgiNamingHelper.java | 4 ++--
.../org/apache/camel/core/osgi/OsgiTypeConverter.java | 2 +-
.../apache/camel/core/osgi/CamelMockBundleContext.java | 3 ++-
.../core/osgi/test/MockTypeConverterRegistry.java | 2 +-
.../metrics/routepolicy/MetricsRoutePolicy.java | 2 +-
43 files changed, 87 insertions(+), 83 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
index 694841c..311f9b2 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
@@ -143,7 +143,7 @@ public final class AdviceWithTasks {
while (it.hasNext()) {
ProcessorDefinition<?> output = it.next();
if (matchBy.match(output)) {
- List<ProcessorDefinition> outputs = getParentOutputs(output.getParent());
+ List<ProcessorDefinition<?>> outputs = getParentOutputs(output.getParent());
if (outputs != null) {
int index = outputs.indexOf(output);
if (index != -1) {
@@ -192,7 +192,7 @@ public final class AdviceWithTasks {
while (it.hasNext()) {
ProcessorDefinition<?> output = it.next();
if (matchBy.match(output)) {
- List<ProcessorDefinition> outputs = getParentOutputs(output.getParent());
+ List<ProcessorDefinition<?>> outputs = getParentOutputs(output.getParent());
if (outputs != null) {
int index = outputs.indexOf(output);
if (index != -1) {
@@ -240,7 +240,7 @@ public final class AdviceWithTasks {
while (it.hasNext()) {
ProcessorDefinition<?> output = it.next();
if (matchBy.match(output)) {
- List<ProcessorDefinition> outputs = getParentOutputs(output.getParent());
+ List<ProcessorDefinition<?>> outputs = getParentOutputs(output.getParent());
if (outputs != null) {
int index = outputs.indexOf(output);
if (index != -1) {
@@ -289,7 +289,7 @@ public final class AdviceWithTasks {
while (it.hasNext()) {
ProcessorDefinition<?> output = it.next();
if (matchBy.match(output)) {
- List<ProcessorDefinition> outputs = getParentOutputs(output.getParent());
+ List<ProcessorDefinition<?>> outputs = getParentOutputs(output.getParent());
if (outputs != null) {
int index = outputs.indexOf(output);
if (index != -1) {
@@ -317,12 +317,11 @@ public final class AdviceWithTasks {
* @param parent the parent
* @return <tt>null</tt> if no parent
*/
- @SuppressWarnings("unchecked")
- private static List<ProcessorDefinition> getParentOutputs(ProcessorDefinition parent) {
+ private static List<ProcessorDefinition<?>> getParentOutputs(ProcessorDefinition<?> parent) {
if (parent == null) {
return null;
}
- List<ProcessorDefinition> outputs = parent.getOutputs();
+ List<ProcessorDefinition<?>> outputs = parent.getOutputs();
if (outputs.size() == 1 && outputs.get(0).isAbstract()) {
// if the output is abstract then get its output, as
outputs = outputs.get(0).getOutputs();
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java b/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java
index a7cf529..7bb716f 100644
--- a/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java
@@ -21,11 +21,8 @@ import java.util.Map;
import org.apache.camel.Endpoint;
import org.apache.camel.LoggingLevel;
-import org.apache.camel.Processor;
import org.apache.camel.impl.UriEndpointComponent;
-import org.apache.camel.processor.CamelLogProcessor;
import org.apache.camel.processor.DefaultExchangeFormatter;
-import org.apache.camel.processor.ThroughputLogger;
import org.apache.camel.spi.ExchangeFormatter;
import org.apache.camel.util.CamelLogger;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
index 397beab..f6e3843 100644
--- a/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
@@ -223,7 +223,9 @@ public class SedaEndpoint extends DefaultEndpoint implements BrowsableEndpoint,
}
// create multicast processor
multicastStarted = false;
- consumerMulticastProcessor = new MulticastProcessor(getCamelContext(), processors, null, true, multicastExecutor, false, false, false, 0, null, false);
+ consumerMulticastProcessor = new MulticastProcessor(getCamelContext(), processors, null,
+ true, multicastExecutor, false, false, false,
+ 0, null, false, false);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 72defeb..822ca9b 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -66,7 +66,6 @@ import org.apache.camel.ShutdownRunningTask;
import org.apache.camel.StartupListener;
import org.apache.camel.StatefulService;
import org.apache.camel.SuspendableService;
-import org.apache.camel.TypeConversionException;
import org.apache.camel.TypeConverter;
import org.apache.camel.VetoCamelContextStartException;
import org.apache.camel.builder.ErrorHandlerBuilder;
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java
index 045095a..7b94e47 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java
@@ -55,6 +55,7 @@ public abstract class DefaultProducer extends ServiceSupport implements Producer
return endpoint.createExchange(pattern);
}
+ @Deprecated
public Exchange createExchange(Exchange exchange) {
return endpoint.createExchange(exchange);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/impl/DefaultRestRegistry.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultRestRegistry.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultRestRegistry.java
index 62194ad..f32c5c5 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultRestRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultRestRegistry.java
@@ -31,6 +31,7 @@ import org.apache.camel.StatefulService;
import org.apache.camel.StaticService;
import org.apache.camel.spi.RestRegistry;
import org.apache.camel.support.LifecycleStrategySupport;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
public class DefaultRestRegistry extends ServiceSupport implements StaticService, RestRegistry, CamelContextAware {
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java b/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java
index 840480b..2a333af 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java
@@ -88,6 +88,7 @@ public class InterceptSendToEndpoint implements Endpoint {
return delegate.createExchange(pattern);
}
+ @Deprecated
public Exchange createExchange(Exchange exchange) {
return delegate.createExchange(exchange);
}
@@ -112,6 +113,7 @@ public class InterceptSendToEndpoint implements Endpoint {
return producer.createExchange(pattern);
}
+ @Deprecated
public Exchange createExchange(Exchange exchange) {
return producer.createExchange(exchange);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/impl/SynchronousDelegateProducer.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/SynchronousDelegateProducer.java b/camel-core/src/main/java/org/apache/camel/impl/SynchronousDelegateProducer.java
index 45395ad..4b506d2 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/SynchronousDelegateProducer.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/SynchronousDelegateProducer.java
@@ -53,6 +53,7 @@ public class SynchronousDelegateProducer implements Producer {
return producer.createExchange(pattern);
}
+ @Deprecated
public Exchange createExchange(Exchange exchange) {
return producer.createExchange(exchange);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/impl/UriEndpointConfiguration.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/UriEndpointConfiguration.java b/camel-core/src/main/java/org/apache/camel/impl/UriEndpointConfiguration.java
index c1fc0b4..0cd944d 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/UriEndpointConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/UriEndpointConfiguration.java
@@ -76,17 +76,17 @@ public class UriEndpointConfiguration implements EndpointConfiguration {
// lets try get the property regardless of if this maps to a valid property name
// then if the introspection fails we will get a valid error otherwise
// lets raise a warning afterwards that we should update the metadata on the endpoint class
- T answer;
try {
- answer = (T)IntrospectionSupport.getProperty(endpoint, name);
+ @SuppressWarnings("unchecked")
+ T answer = (T)IntrospectionSupport.getProperty(endpoint, name);
+ if (config == null) {
+ warnMissingUriParamOnProperty(name);
+ }
+ return answer;
} catch (Exception e) {
throw new RuntimeCamelException(
"Failed to get property '" + name + "' on " + endpoint + " due " + e.getMessage(), e);
}
- if (config == null) {
- warnMissingUriParamOnProperty(name);
- }
- return answer;
}
protected void warnMissingUriParamOnProperty(String name) {
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java b/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
index 97013bd..af4e1b3 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
@@ -514,10 +514,10 @@ public abstract class BaseTypeConverterRegistry extends ServiceSupport implement
return null;
}
- public List<Class[]> listAllTypeConvertersFromTo() {
- List<Class[]> answer = new ArrayList<Class[]>(typeMappings.size());
+ public List<Class<?>[]> listAllTypeConvertersFromTo() {
+ List<Class<?>[]> answer = new ArrayList<Class<?>[]>(typeMappings.size());
for (TypeMapping mapping : typeMappings.keySet()) {
- answer.add(new Class[]{mapping.getFromType(), mapping.getToType()});
+ answer.add(new Class<?>[]{mapping.getFromType(), mapping.getToType()});
}
return answer;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/management/DefaultManagementMBeanAssembler.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementMBeanAssembler.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementMBeanAssembler.java
index fde3592..abc8d44 100644
--- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementMBeanAssembler.java
+++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementMBeanAssembler.java
@@ -47,7 +47,7 @@ public class DefaultManagementMBeanAssembler implements ManagementMBeanAssembler
public DefaultManagementMBeanAssembler(CamelContext camelContext) {
this.camelContext = camelContext;
- this.assembler = new MBeanInfoAssembler(camelContext);
+ this.assembler = new MBeanInfoAssembler();
}
public ModelMBean assemble(MBeanServer mBeanServer, Object obj, ObjectName name) throws JMException {
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/management/MBeanInfoAssembler.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/MBeanInfoAssembler.java b/camel-core/src/main/java/org/apache/camel/management/MBeanInfoAssembler.java
index 84f0470..09cbf89 100644
--- a/camel-core/src/main/java/org/apache/camel/management/MBeanInfoAssembler.java
+++ b/camel-core/src/main/java/org/apache/camel/management/MBeanInfoAssembler.java
@@ -59,10 +59,11 @@ public class MBeanInfoAssembler implements Service {
// which could prevent classloader to unload classes if being referenced from this cache
private final LRUCache<Class<?>, MBeanAttributesAndOperations> cache = new LRUWeakCache<Class<?>, MBeanAttributesAndOperations>(1000);
- private final CamelContext camelContext;
+ public MBeanInfoAssembler() {
+ }
+ @Deprecated
public MBeanInfoAssembler(CamelContext camelContext) {
- this.camelContext = camelContext;
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTypeConverterRegistry.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTypeConverterRegistry.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTypeConverterRegistry.java
index f4e4bc3..7a1e183 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTypeConverterRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTypeConverterRegistry.java
@@ -92,8 +92,8 @@ public class ManagedTypeConverterRegistry extends ManagedService implements Mana
public TabularData listTypeConverters() {
try {
TabularData answer = new TabularDataSupport(CamelOpenMBeanTypes.listTypeConvertersTabularType());
- List<Class[]> converters = registry.listAllTypeConvertersFromTo();
- for (Class[] entry : converters) {
+ List<Class<?>[]> converters = registry.listAllTypeConvertersFromTo();
+ for (Class<?>[] entry : converters) {
CompositeType ct = CamelOpenMBeanTypes.listTypeConvertersCompositeType();
String from = entry[0].getCanonicalName();
String to = entry[1].getCanonicalName();
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
index 5655ca5..396243f 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
@@ -34,7 +34,7 @@ import org.apache.camel.util.IntrospectionSupport;
@XmlRootElement(name = "restBinding")
@XmlAccessorType(XmlAccessType.FIELD)
-public class RestBindingDefinition extends NoOutputDefinition {
+public class RestBindingDefinition extends NoOutputDefinition<RestBindingDefinition> {
@XmlAttribute
private String consumes;
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
index 777ed1b..ea90c4f 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
@@ -59,7 +59,7 @@ public class VerbDefinition extends OptionalIdentifiedDefinition<VerbDefinition>
@XmlElement(required = false, name = "to", type = ToDefinition.class),
@XmlElement(required = false, name = "route", type = RouteDefinition.class)}
)
- private OptionalIdentifiedDefinition toOrRoute;
+ private OptionalIdentifiedDefinition<?> toOrRoute;
// the Java DSL uses the to or route definition directory
@XmlTransient
@@ -172,11 +172,11 @@ public class VerbDefinition extends OptionalIdentifiedDefinition<VerbDefinition>
this.toOrRoute = to;
}
- public OptionalIdentifiedDefinition getToOrRoute() {
+ public OptionalIdentifiedDefinition<?> getToOrRoute() {
return toOrRoute;
}
- public void setToOrRoute(OptionalIdentifiedDefinition toOrRoute) {
+ public void setToOrRoute(OptionalIdentifiedDefinition<?> toOrRoute) {
this.toOrRoute = toOrRoute;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/Splitter.java b/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
index a0b4a2a..314de20 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
@@ -41,8 +41,6 @@ import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.apache.camel.util.ObjectHelper.notNull;
@@ -55,7 +53,6 @@ import static org.apache.camel.util.ObjectHelper.notNull;
* @version
*/
public class Splitter extends MulticastProcessor implements AsyncProcessor, Traceable {
- private static final Logger LOG = LoggerFactory.getLogger(Splitter.class);
private final Expression expression;
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/processor/ThrottlerRejectedExecutionException.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/ThrottlerRejectedExecutionException.java b/camel-core/src/main/java/org/apache/camel/processor/ThrottlerRejectedExecutionException.java
index bdda105..144fd7b 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/ThrottlerRejectedExecutionException.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/ThrottlerRejectedExecutionException.java
@@ -21,6 +21,8 @@ import java.util.concurrent.RejectedExecutionException;
public class ThrottlerRejectedExecutionException
extends RejectedExecutionException {
+ private static final long serialVersionUID = 1L;
+
public ThrottlerRejectedExecutionException(String message) {
super(message);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/processor/UnitOfWorkProducer.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/UnitOfWorkProducer.java b/camel-core/src/main/java/org/apache/camel/processor/UnitOfWorkProducer.java
index 240dfdc..7684b65 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/UnitOfWorkProducer.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/UnitOfWorkProducer.java
@@ -64,6 +64,7 @@ public final class UnitOfWorkProducer implements Producer {
return producer.createExchange(pattern);
}
+ @Deprecated
public Exchange createExchange(Exchange exchange) {
return producer.createExchange(exchange);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanAdapter.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanAdapter.java b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanAdapter.java
index a2bd45a..ba6b93d 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanAdapter.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanAdapter.java
@@ -221,7 +221,7 @@ public final class AggregationStrategyBeanAdapter extends ServiceSupport impleme
}
// create the method info which has adapted to the pojo
- AggregationStrategyBeanInfo bi = new AggregationStrategyBeanInfo(getCamelContext(), type, found);
+ AggregationStrategyBeanInfo bi = new AggregationStrategyBeanInfo(type, found);
mi = bi.createMethodInfo();
// in case the POJO is CamelContextAware
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanInfo.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanInfo.java b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanInfo.java
index ed93a96e..ad34e28 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanInfo.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanInfo.java
@@ -37,12 +37,14 @@ public class AggregationStrategyBeanInfo {
private static final Logger LOG = LoggerFactory.getLogger(AggregationStrategyBeanInfo.class);
- private final CamelContext camelContext;
private final Class<?> type;
private final Method method;
+ @Deprecated
public AggregationStrategyBeanInfo(CamelContext camelContext, Class<?> type, Method method) {
- this.camelContext = camelContext;
+ this(type, method);
+ }
+ public AggregationStrategyBeanInfo(Class<?> type, Method method) {
this.type = type;
this.method = method;
}
@@ -114,7 +116,7 @@ public class AggregationStrategyBeanInfo {
}
}
- return new AggregationStrategyMethodInfo(camelContext, type, method, oldParameters, newParameters);
+ return new AggregationStrategyMethodInfo(method, oldParameters, newParameters);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyMethodInfo.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyMethodInfo.java b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyMethodInfo.java
index ec92ca9..e677705 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyMethodInfo.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyMethodInfo.java
@@ -29,16 +29,19 @@ import org.apache.camel.component.bean.ParameterInfo;
*/
public class AggregationStrategyMethodInfo {
- private final CamelContext camelContext;
- private final Class<?> type;
private final Method method;
private final List<ParameterInfo> oldParameters;
private final List<ParameterInfo> newParameters;
+
+ @Deprecated
public AggregationStrategyMethodInfo(CamelContext camelContext, Class<?> type, Method method,
List<ParameterInfo> oldParameters, List<ParameterInfo> newParameters) {
- this.camelContext = camelContext;
- this.type = type;
+ this(method, oldParameters, newParameters);
+ }
+ public AggregationStrategyMethodInfo(Method method,
+ List<ParameterInfo> oldParameters,
+ List<ParameterInfo> newParameters) {
this.method = method;
this.oldParameters = oldParameters;
this.newParameters = newParameters;
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/processor/binding/BindingException.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/binding/BindingException.java b/camel-core/src/main/java/org/apache/camel/processor/binding/BindingException.java
index 7887c50..9493c59 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/binding/BindingException.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/binding/BindingException.java
@@ -24,6 +24,8 @@ import org.apache.camel.Exchange;
*/
public class BindingException extends CamelExchangeException {
+ private static final long serialVersionUID = -3495429794010365522L;
+
public BindingException(String message, Exchange exchange) {
super(message, exchange);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java b/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java
index 6de4cdd..f5b7456 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java
@@ -269,7 +269,7 @@ public class BacklogDebugger extends ServiceSupport implements InterceptStrategy
if (remove) {
removeMessageBodyOnBreakpoint(nodeId);
} else {
- Class oldType;
+ Class<?> oldType;
if (se.getExchange().hasOut()) {
oldType = se.getExchange().getOut().getBody() != null ? se.getExchange().getOut().getBody().getClass() : null;
} else {
@@ -280,7 +280,7 @@ public class BacklogDebugger extends ServiceSupport implements InterceptStrategy
}
}
- public void setMessageBodyOnBreakpoint(String nodeId, Object body, Class type) {
+ public void setMessageBodyOnBreakpoint(String nodeId, Object body, Class<?> type) {
SuspendedExchange se = suspendedBreakpoints.get(nodeId);
if (se != null) {
boolean remove = body == null;
@@ -321,7 +321,7 @@ public class BacklogDebugger extends ServiceSupport implements InterceptStrategy
public void setMessageHeaderOnBreakpoint(String nodeId, String headerName, Object value) throws NoTypeConversionAvailableException {
SuspendedExchange se = suspendedBreakpoints.get(nodeId);
if (se != null) {
- Class oldType;
+ Class<?> oldType;
if (se.getExchange().hasOut()) {
oldType = se.getExchange().getOut().getHeader(headerName) != null ? se.getExchange().getOut().getHeader(headerName).getClass() : null;
} else {
@@ -331,7 +331,7 @@ public class BacklogDebugger extends ServiceSupport implements InterceptStrategy
}
}
- public void setMessageHeaderOnBreakpoint(String nodeId, String headerName, Object value, Class type) throws NoTypeConversionAvailableException {
+ public void setMessageHeaderOnBreakpoint(String nodeId, String headerName, Object value, Class<?> type) throws NoTypeConversionAvailableException {
SuspendedExchange se = suspendedBreakpoints.get(nodeId);
if (se != null) {
logger.log("Breakpoint at node " + nodeId + " is updating message header on exchangeId: " + se.getExchange().getExchangeId() + " with header: " + headerName + " and value: " + value);
@@ -517,10 +517,6 @@ public class BacklogDebugger extends ServiceSupport implements InterceptStrategy
this.condition = condition;
}
- public String getNodeId() {
- return nodeId;
- }
-
public Predicate getCondition() {
return condition;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java b/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
index f29bb23..9338271 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
@@ -158,6 +158,7 @@ public class DefaultChannel extends CamelInternalProcessor implements ModelChann
ServiceHelper.stopServices(output, errorHandler);
}
+ @SuppressWarnings("deprecation")
public void initChannel(ProcessorDefinition<?> outputDefinition, RouteContext routeContext) throws Exception {
this.routeContext = routeContext;
this.definition = outputDefinition;
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java b/camel-core/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java
index d5a1114..d529bfd 100644
--- a/camel-core/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java
@@ -114,7 +114,7 @@ public interface TypeConverterRegistry extends StaticService {
*
* @return a list containing fromType/toType class names
*/
- List<Class[]> listAllTypeConvertersFromTo();
+ List<Class<?>[]> listAllTypeConvertersFromTo();
/**
* Sets the injector to be used for creating new instances during type conversions.
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/support/DefaultTimeoutMap.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/support/DefaultTimeoutMap.java b/camel-core/src/main/java/org/apache/camel/support/DefaultTimeoutMap.java
index 7dd60ee..94e4026 100644
--- a/camel-core/src/main/java/org/apache/camel/support/DefaultTimeoutMap.java
+++ b/camel-core/src/main/java/org/apache/camel/support/DefaultTimeoutMap.java
@@ -55,7 +55,7 @@ public class DefaultTimeoutMap<K, V> extends ServiceSupport implements TimeoutMa
private final ConcurrentMap<K, TimeoutMapEntry<K, V>> map = new ConcurrentHashMap<K, TimeoutMapEntry<K, V>>();
private final ScheduledExecutorService executor;
- private volatile ScheduledFuture future;
+ private volatile ScheduledFuture<?> future;
private final long purgePollTime;
private final Lock lock = new ReentrantLock();
private boolean useLock = true;
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/util/HostUtils.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/HostUtils.java b/camel-core/src/main/java/org/apache/camel/util/HostUtils.java
index f8ff6a0..f659a30 100644
--- a/camel-core/src/main/java/org/apache/camel/util/HostUtils.java
+++ b/camel-core/src/main/java/org/apache/camel/util/HostUtils.java
@@ -40,9 +40,9 @@ public final class HostUtils {
//let's have them sort by interface name (by using a TreeMap).
Map<String, Set<InetAddress>> interfaceAddressMap = new TreeMap<String, Set<InetAddress>>();
try {
- Enumeration ifaces = NetworkInterface.getNetworkInterfaces();
+ Enumeration<NetworkInterface> ifaces = NetworkInterface.getNetworkInterfaces();
while (ifaces.hasMoreElements()) {
- NetworkInterface iface = (NetworkInterface) ifaces.nextElement();
+ NetworkInterface iface = ifaces.nextElement();
//We only care about usable non-loopback interfaces.
if (iface.isUp() && !iface.isLoopback() && !iface.isPointToPoint()) {
String name = iface.getName();
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiComponent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiComponent.java b/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiComponent.java
index 9d20455..93803cd 100644
--- a/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiComponent.java
@@ -213,7 +213,7 @@ public abstract class AbstractApiComponent<E extends Enum<E> & ApiName, T, S ext
Set<String> existingOptions = configuration.getParameters().keySet();
// get all method options
try {
- final List arguments = helper.getArguments(methodName);
+ final List<Object> arguments = helper.getArguments(methodName);
final int nArgs = arguments.size();
final Set<String> options = new HashSet<String>();
for (int i = 1; i < nArgs; i += 2) {
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiProducer.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiProducer.java b/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiProducer.java
index b4c7427..9995615 100644
--- a/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiProducer.java
+++ b/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiProducer.java
@@ -40,7 +40,7 @@ public abstract class AbstractApiProducer<E extends Enum<E> & ApiName, T>
protected final AbstractApiEndpoint<E, T> endpoint;
// properties helper
- protected final ApiMethodPropertiesHelper propertiesHelper;
+ protected final ApiMethodPropertiesHelper<T> propertiesHelper;
// method helper
protected final ApiMethodHelper<?> methodHelper;
@@ -48,10 +48,7 @@ public abstract class AbstractApiProducer<E extends Enum<E> & ApiName, T>
// logger
private final transient Logger log = LoggerFactory.getLogger(getClass());
- // cached Endpoint executor service
- private ExecutorService executorService;
-
- public AbstractApiProducer(AbstractApiEndpoint<E, T> endpoint, ApiMethodPropertiesHelper propertiesHelper) {
+ public AbstractApiProducer(AbstractApiEndpoint<E, T> endpoint, ApiMethodPropertiesHelper<T> propertiesHelper) {
super(endpoint);
this.propertiesHelper = propertiesHelper;
this.endpoint = endpoint;
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/util/component/ApiCollection.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/component/ApiCollection.java b/camel-core/src/main/java/org/apache/camel/util/component/ApiCollection.java
index f39440f..b1e05fc 100644
--- a/camel-core/src/main/java/org/apache/camel/util/component/ApiCollection.java
+++ b/camel-core/src/main/java/org/apache/camel/util/component/ApiCollection.java
@@ -25,7 +25,6 @@ import java.util.Set;
/**
* Base class for a collection of ApiMethods. Meant to be extended by Components to create the api name map.
*/
-@SuppressWarnings("unused")
public abstract class ApiCollection<E extends Enum<E> & ApiName, T> {
protected final Map<E, ApiMethodHelper<? extends ApiMethod>> apis = new HashMap<E, ApiMethodHelper<? extends ApiMethod>>();
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/util/component/ApiConsumerHelper.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/component/ApiConsumerHelper.java b/camel-core/src/main/java/org/apache/camel/util/component/ApiConsumerHelper.java
index 30a7745..7bcfb37 100644
--- a/camel-core/src/main/java/org/apache/camel/util/component/ApiConsumerHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/component/ApiConsumerHelper.java
@@ -59,7 +59,7 @@ public final class ApiConsumerHelper {
endpoint.getCandidates(), ApiMethodHelper.MatchType.SUPER_SET, argNamesArray);
if (filteredMethods.isEmpty()) {
- ApiMethodHelper methodHelper = endpoint.getMethodHelper();
+ ApiMethodHelper<? extends ApiMethod> methodHelper = endpoint.getMethodHelper();
throw new IllegalArgumentException(
String.format("Missing properties for %s/%s, need one or more from %s",
endpoint.getApiName().getName(), endpoint.getMethodName(),
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/util/component/ApiMethod.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/component/ApiMethod.java b/camel-core/src/main/java/org/apache/camel/util/component/ApiMethod.java
index a2274bf..00a7b5c 100644
--- a/camel-core/src/main/java/org/apache/camel/util/component/ApiMethod.java
+++ b/camel-core/src/main/java/org/apache/camel/util/component/ApiMethod.java
@@ -21,6 +21,7 @@ import java.util.List;
/**
* Interface for proxy methods.
+ * @param <T>
*/
public interface ApiMethod {
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodHelper.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodHelper.java b/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodHelper.java
index 7ec732b..3b04db7 100644
--- a/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodHelper.java
@@ -387,13 +387,13 @@ public final class ApiMethodHelper<T extends Enum<T> & ApiMethod> {
// the alternative of trying to convert ApiMethod and associated classes to generic classes would a bear!!!
@SuppressWarnings("unchecked")
public static ApiMethod getHighestPriorityMethod(List<? extends ApiMethod> filteredMethods) {
- ApiMethod highest = null;
+ Comparable<ApiMethod> highest = null;
for (ApiMethod method : filteredMethods) {
- if (highest == null || ((Enum)method).compareTo((Enum) highest) > 0) {
- highest = method;
+ if (highest == null || highest.compareTo(method) <= 0) {
+ highest = (Comparable<ApiMethod>)method;
}
}
- return highest;
+ return (ApiMethod)highest;
}
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodParser.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodParser.java b/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodParser.java
index 27c8be8..aaa2d75 100644
--- a/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodParser.java
+++ b/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodParser.java
@@ -42,10 +42,10 @@ public abstract class ApiMethodParser<T> {
private static final Pattern METHOD_PATTERN = Pattern.compile("\\s*([^<\\s]+)\\s*(<[^>]+>)?\\s+(\\S+)\\s*\\(\\s*([\\S\\s,]*)\\)\\s*;?\\s*");
private static final String JAVA_LANG = "java.lang.";
- private static final Map<String, Class> PRIMITIVE_TYPES;
+ private static final Map<String, Class<?>> PRIMITIVE_TYPES;
static {
- PRIMITIVE_TYPES = new HashMap<String, Class>();
+ PRIMITIVE_TYPES = new HashMap<String, Class<?>>();
PRIMITIVE_TYPES.put("int", Integer.TYPE);
PRIMITIVE_TYPES.put("long", Long.TYPE);
PRIMITIVE_TYPES.put("double", Double.TYPE);
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/camel-core/src/main/java/org/apache/camel/view/GraphGeneratorSupport.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/view/GraphGeneratorSupport.java b/camel-core/src/main/java/org/apache/camel/view/GraphGeneratorSupport.java
index 2249148..c7c1e4f 100644
--- a/camel-core/src/main/java/org/apache/camel/view/GraphGeneratorSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/view/GraphGeneratorSupport.java
@@ -67,7 +67,6 @@ public abstract class GraphGeneratorSupport extends GraphSupport {
if (makeParentDirs) {
parent.mkdirs();
}
- @SuppressWarnings("deprecation")
List<RouteDefinition> routes = context.getRouteDefinitions();
routeGroupMap = createRouteGroupMap(routes);
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/components/camel-box/src/main/java/org/apache/camel/component/box/BoxProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-box/src/main/java/org/apache/camel/component/box/BoxProducer.java b/components/camel-box/src/main/java/org/apache/camel/component/box/BoxProducer.java
index e08a59c..95aaae5 100644
--- a/components/camel-box/src/main/java/org/apache/camel/component/box/BoxProducer.java
+++ b/components/camel-box/src/main/java/org/apache/camel/component/box/BoxProducer.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.box;
import org.apache.camel.component.box.internal.BoxApiName;
-import org.apache.camel.component.box.internal.BoxConstants;
import org.apache.camel.component.box.internal.BoxPropertiesHelper;
import org.apache.camel.util.component.AbstractApiProducer;
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
----------------------------------------------------------------------
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
index 02eeb8e..78111db 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
@@ -46,7 +46,8 @@ public class OsgiCamelContextPublisher extends EventNotifierSupport {
public static final String CONTEXT_MANAGEMENT_NAME_PROPERTY = "camel.context.managementname";
private final BundleContext bundleContext;
- private final Map<CamelContext, ServiceRegistration> registrations = new ConcurrentHashMap<CamelContext, ServiceRegistration>();
+ private final Map<CamelContext, ServiceRegistration<?>> registrations
+ = new ConcurrentHashMap<CamelContext, ServiceRegistration<?>>();
public OsgiCamelContextPublisher(BundleContext bundleContext) {
this.bundleContext = bundleContext;
@@ -58,7 +59,7 @@ public class OsgiCamelContextPublisher extends EventNotifierSupport {
registerCamelContext(context);
} else if (event instanceof CamelContextStoppingEvent) {
CamelContext context = ((CamelContextStoppingEvent) event).getContext();
- ServiceRegistration reg = registrations.remove(context);
+ ServiceRegistration<?> reg = registrations.remove(context);
if (reg != null) {
if (log.isDebugEnabled()) {
log.debug("Unregistering CamelContext [{}] from OSGi registry", context.getName());
@@ -92,7 +93,7 @@ public class OsgiCamelContextPublisher extends EventNotifierSupport {
registrations.clear();
}
- public ServiceRegistration registerCamelContext(CamelContext camelContext) throws InvalidSyntaxException {
+ public ServiceRegistration<?> registerCamelContext(CamelContext camelContext) throws InvalidSyntaxException {
// avoid registering the same service again
// we must include unique camel management name so the symbolic name becomes unique,
// in case the bundle has more than one CamelContext
@@ -115,7 +116,7 @@ public class OsgiCamelContextPublisher extends EventNotifierSupport {
log.debug("Registering CamelContext [{}] of in OSGi registry", camelContext.getName());
}
- ServiceRegistration reg = bundleContext.registerService(CamelContext.class.getName(), camelContext, props);
+ ServiceRegistration<?> reg = bundleContext.registerService(CamelContext.class.getName(), camelContext, props);
if (reg != null) {
registrations.put(camelContext, reg);
}
@@ -138,7 +139,7 @@ public class OsgiCamelContextPublisher extends EventNotifierSupport {
*/
public static boolean lookupCamelContext(BundleContext bundleContext, String symbolicName, String contextName) throws InvalidSyntaxException {
Version bundleVersion = getBundleVersion(bundleContext.getBundle());
- ServiceReference[] refs = bundleContext.getServiceReferences(CamelContext.class.getName(),
+ ServiceReference<?>[] refs = bundleContext.getServiceReferences(CamelContext.class.getName(),
"(&(" + CONTEXT_SYMBOLIC_NAME_PROPERTY + "=" + symbolicName + ")"
+ "(" + CONTEXT_NAME_PROPERTY + "=" + contextName + ")"
+ "(" + CONTEXT_VERSION_PROPERTY + "=" + bundleVersion + "))");
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiEventAdminNotifier.java
----------------------------------------------------------------------
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiEventAdminNotifier.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiEventAdminNotifier.java
index b68a158..74cd06c 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiEventAdminNotifier.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiEventAdminNotifier.java
@@ -52,16 +52,16 @@ public class OsgiEventAdminNotifier extends EventNotifierSupport {
public static final String TOPIC_CAMEL_ROUTE_EVENTS = TOPIC_CAMEL_EVENTS + "route/";
private final BundleContext bundleContext;
- private final ServiceTracker tracker;
+ private final ServiceTracker<EventAdmin, EventAdmin> tracker;
public OsgiEventAdminNotifier(BundleContext bundleContext) {
this.bundleContext = bundleContext;
- this.tracker = new ServiceTracker(bundleContext, EventAdmin.class.getName(), null);
+ this.tracker = new ServiceTracker<EventAdmin, EventAdmin>(bundleContext, EventAdmin.class.getName(), null);
setIgnoreExchangeEvents(true);
}
public void notify(EventObject event) throws Exception {
- EventAdmin eventAdmin = (EventAdmin) tracker.getService();
+ EventAdmin eventAdmin = tracker.getService();
if (eventAdmin == null) {
return;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiNamingHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiNamingHelper.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiNamingHelper.java
index 5c41f34..ee1532f 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiNamingHelper.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiNamingHelper.java
@@ -63,9 +63,9 @@ public final class OsgiNamingHelper {
}
LOG.trace("Checking OSGi Service Registry for existence of existing CamelContext with name: {}", candidate);
- ServiceReference[] refs = context.getServiceReferences(CamelContext.class.getName(), "(" + key + "=" + candidate + ")");
+ ServiceReference<?>[] refs = context.getServiceReferences(CamelContext.class.getName(), "(" + key + "=" + candidate + ")");
if (refs != null && refs.length > 0) {
- for (ServiceReference ref : refs) {
+ for (ServiceReference<?> ref : refs) {
Object id = ref.getProperty(key);
if (id != null && candidate.equals(id)) {
clash = true;
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
----------------------------------------------------------------------
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
index e5452fe..8bd1c00 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
@@ -140,7 +140,7 @@ public class OsgiTypeConverter extends ServiceSupport implements TypeConverter,
return getDelegate().lookup(toType, fromType);
}
- public List<Class[]> listAllTypeConvertersFromTo() {
+ public List<Class<?>[]> listAllTypeConvertersFromTo() {
return getDelegate().listAllTypeConvertersFromTo();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundleContext.java
----------------------------------------------------------------------
diff --git a/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundleContext.java b/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundleContext.java
index efda490..b6a410f 100644
--- a/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundleContext.java
+++ b/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundleContext.java
@@ -40,7 +40,7 @@ public class CamelMockBundleContext extends MockBundleContext {
super(bundle);
}
- public Object getService(ServiceReference reference) {
+ public Object getService(@SuppressWarnings("rawtypes") ServiceReference reference) {
String[] classNames = (String[]) reference.getProperty(Constants.OBJECTCLASS);
if (classNames[0].equals("org.apache.camel.core.osgi.test.MyService")) {
return new MyService();
@@ -67,6 +67,7 @@ public class CamelMockBundleContext extends MockBundleContext {
}
}
+ @SuppressWarnings("rawtypes")
public ServiceReference[] getServiceReferences(String clazz, String filter) throws InvalidSyntaxException {
// just simulate when the bundle context doesn't have right service reference
if (filter != null && filter.indexOf("name=test") > 0) {
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/test/MockTypeConverterRegistry.java
----------------------------------------------------------------------
diff --git a/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/test/MockTypeConverterRegistry.java b/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/test/MockTypeConverterRegistry.java
index 45ef590..17fa76b 100644
--- a/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/test/MockTypeConverterRegistry.java
+++ b/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/test/MockTypeConverterRegistry.java
@@ -52,7 +52,7 @@ public class MockTypeConverterRegistry implements TypeConverterRegistry {
return null;
}
- public List<Class[]> listAllTypeConvertersFromTo() {
+ public List<Class<?>[]> listAllTypeConvertersFromTo() {
return null;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d5253916/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicy.java
----------------------------------------------------------------------
diff --git a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicy.java b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicy.java
index 4d7334a..ef1a60e 100644
--- a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicy.java
+++ b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicy.java
@@ -43,7 +43,7 @@ public class MetricsRoutePolicy extends RoutePolicySupport {
private final ConcurrentMap<Route, MetricsStatistics> statistics = new ConcurrentHashMap<Route, MetricsStatistics>();
private Route route;
- private final static class MetricsStatistics {
+ private static final class MetricsStatistics {
private Counter total;
private Counter inflight;
private Meter requests;