This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 0d5b8a1 camel-core - Polished some TODOs
0d5b8a1 is described below
commit 0d5b8a194d921ed089555edeb81e2dc2fb8d5250
Author: Claus Ibsen <[email protected]>
AuthorDate: Sun Apr 7 10:35:21 2019 +0200
camel-core - Polished some TODOs
---
MIGRATION.md | 2 +-
.../main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java | 2 --
.../src/main/java/org/apache/camel/builder/NotifyBuilder.java | 2 --
.../org/apache/camel/impl/DefaultCamelContextAutoStartupTest.java | 2 --
.../main/java/org/apache/camel/support/RoutePolicySupport.java | 8 ++------
5 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/MIGRATION.md b/MIGRATION.md
index 9d3a086..0f09767 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -300,7 +300,7 @@ The class `MemoryIdempotentRepository` has been moved from
`org.apache.camel.pro
#### Route Policies
-The class `org.apache.camel.impl.RoutePolicySupport` has been moved to
`org.apache.camel.support.RoutePolicySupport`.
+The class `org.apache.camel.impl.RoutePolicySupport` has been moved to
`org.apache.camel.support.RoutePolicySupport`. The return type from
`startConsumer` and `stopConsumer` has been changed from `boolean` to `void` as
they always returned `true` before.
The class `org.apache.camel.impl.ThrottlingInflightRoutePolicy` has been moved
to `org.apache.camel.throttling.ThrottlingInflightRoutePolicy`
diff --git
a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
index eb3dce8..c851d31 100644
---
a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
+++
b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
@@ -107,8 +107,6 @@ public class OsgiTypeConverter extends ServiceSupport
implements TypeConverter,
}
// It can force camel to reload the type converter again
this.delegate = null;
-
- // TODO: reloading all type converters when one service is removed is
suboptimal...
}
@Override
diff --git
a/core/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
b/core/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
index 356ca06..6ebe1a8 100644
--- a/core/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
@@ -58,8 +58,6 @@ import org.slf4j.LoggerFactory;
*/
public class NotifyBuilder {
- // TODO: camel-mock
-
private static final Logger LOG =
LoggerFactory.getLogger(NotifyBuilder.class);
private final CamelContext context;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextAutoStartupTest.java
b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextAutoStartupTest.java
index a97dc74..67c2937 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextAutoStartupTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextAutoStartupTest.java
@@ -23,8 +23,6 @@ import org.junit.Test;
public class DefaultCamelContextAutoStartupTest extends TestSupport {
- // TODO: We should have a JMX test of this as well
-
@Test
public void testAutoStartupFalseContextStart() throws Exception {
DefaultCamelContext camel = new DefaultCamelContext(false);
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/RoutePolicySupport.java
b/core/camel-support/src/main/java/org/apache/camel/support/RoutePolicySupport.java
index 403c703..b6498b2 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/RoutePolicySupport.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/RoutePolicySupport.java
@@ -77,11 +77,9 @@ public abstract class RoutePolicySupport extends
ServiceSupport implements Route
* @return the returned value is always <tt>true</tt> and should not be
used.
* @see #resumeOrStartConsumer(Consumer)
*/
- public boolean startConsumer(Consumer consumer) throws Exception {
- // TODO: change to void in Camel 3.0
+ public void startConsumer(Consumer consumer) throws Exception {
ServiceHelper.startService(consumer);
log.debug("Started consumer {}", consumer);
- return true;
}
/**
@@ -90,12 +88,10 @@ public abstract class RoutePolicySupport extends
ServiceSupport implements Route
* @return the returned value is always <tt>true</tt> and should not be
used.
* @see #suspendOrStopConsumer(Consumer)
*/
- public boolean stopConsumer(Consumer consumer) throws Exception {
- // TODO: change to void in Camel 3.0
+ public void stopConsumer(Consumer consumer) throws Exception {
// stop and shutdown
ServiceHelper.stopAndShutdownServices(consumer);
log.debug("Stopped consumer {}", consumer);
- return true;
}
/**
