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 f96dd8f CAMEL-14529: Remove getProcessors from Pipeline as you should
use next instead which is a read-only view.
f96dd8f is described below
commit f96dd8f302ef3c1a9548febcd36b91b26319c4f2
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Feb 10 15:07:10 2020 +0100
CAMEL-14529: Remove getProcessors from Pipeline as you should use next
instead which is a read-only view.
---
.../src/main/java/org/apache/camel/processor/Pipeline.java | 5 -----
core/camel-core/src/test/java/org/apache/camel/TestSupport.java | 2 +-
.../src/test/java/org/apache/camel/builder/RouteBuilderTest.java | 8 ++++----
.../java/org/apache/camel/processor/DefaultErrorHandlerTest.java | 2 +-
.../camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java | 2 +-
.../apache/camel/management/DefaultManagementObjectStrategy.java | 2 +-
docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc | 4 ++++
7 files changed, 12 insertions(+), 13 deletions(-)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/processor/Pipeline.java
b/core/camel-base/src/main/java/org/apache/camel/processor/Pipeline.java
index f36ae0d..d958b4d 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/Pipeline.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/Pipeline.java
@@ -164,11 +164,6 @@ public class Pipeline extends AsyncProcessorSupport
implements Navigate<Processo
return id;
}
- @SuppressWarnings("unchecked")
- public List<Processor> getProcessors() {
- return (List) processors;
- }
-
@Override
public String getTraceLabel() {
return "pipeline";
diff --git a/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
b/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
index 786fd44..f1eab1c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
+++ b/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
@@ -385,7 +385,7 @@ public abstract class TestSupport extends Assert {
public static Channel unwrapChannel(Processor processor) {
while (true) {
if (processor instanceof Pipeline) {
- processor = ((Pipeline)processor).getProcessors().get(0);
+ processor = ((Pipeline)processor).next().get(0);
}
if (processor instanceof Channel) {
return (Channel)processor;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
b/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
index e5d6063..5574d48 100644
---
a/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
@@ -287,10 +287,10 @@ public class RouteBuilderTest extends TestSupport {
EventDrivenConsumerRoute consumer =
assertIsInstanceOf(EventDrivenConsumerRoute.class, route);
Pipeline line = assertIsInstanceOf(Pipeline.class,
unwrap(consumer.getProcessor()));
- assertEquals(3, line.getProcessors().size());
+ assertEquals(3, line.next().size());
// last should be our seda
- List<Processor> processors = new ArrayList<>(line.getProcessors());
+ List<Processor> processors = new ArrayList<>(line.next());
Processor sendTo = assertIsInstanceOf(SendProcessor.class,
unwrapChannel(processors.get(2)).getNextProcessor());
assertSendTo(sendTo, "direct://d");
}
@@ -360,7 +360,7 @@ public class RouteBuilderTest extends TestSupport {
Channel channel = unwrapChannel(consumer.getProcessor());
Pipeline line = assertIsInstanceOf(Pipeline.class,
channel.getNextProcessor());
- Iterator<?> it = line.getProcessors().iterator();
+ Iterator<?> it = line.next().iterator();
// EvaluateExpressionProcessor should be wrapped in error handler
Object first = it.next();
@@ -469,7 +469,7 @@ public class RouteBuilderTest extends TestSupport {
EventDrivenConsumerRoute consumer =
assertIsInstanceOf(EventDrivenConsumerRoute.class, route);
Pipeline line = assertIsInstanceOf(Pipeline.class,
unwrap(consumer.getProcessor()));
- Iterator<Processor> it = line.getProcessors().iterator();
+ Iterator<Processor> it = line.next().iterator();
assertIsInstanceOf(ThreadsProcessor.class,
unwrapChannel(it.next()).getNextProcessor());
assertIsInstanceOf(SendProcessor.class,
unwrapChannel(it.next()).getNextProcessor());
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/DefaultErrorHandlerTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/DefaultErrorHandlerTest.java
index 0f733e5..ba52941 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/DefaultErrorHandlerTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/DefaultErrorHandlerTest.java
@@ -43,7 +43,7 @@ public class DefaultErrorHandlerTest extends
ContextTestSupport {
// there should be a default error handler in front of each processor
in
// this pipeline
- for (Processor child : pipeline.getProcessors()) {
+ for (Processor child : pipeline.next()) {
Channel channel = assertIsInstanceOf(Channel.class, child);
assertNotNull("There should be an error handler",
channel.getErrorHandler());
assertIsInstanceOf(DefaultErrorHandler.class,
channel.getErrorHandler());
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java
index f8fd85a..bb82bf0 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java
@@ -76,7 +76,7 @@ public class RandomLoadBalanceJavaDSLBuilderTest extends
RandomLoadBalanceTest {
private void navigateRoute(Navigate<Processor> nav, StringBuilder sb) {
if (nav instanceof Pipeline) {
- nav = (Navigate<Processor>)((Pipeline)nav).getProcessors().get(0);
+ nav = (Navigate<Processor>) nav.next().get(0);
}
if (!nav.hasNext()) {
diff --git
a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
index 8b0d476..494f43f 100644
---
a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
+++
b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
@@ -305,7 +305,7 @@ public class DefaultManagementObjectStrategy implements
ManagementObjectStrategy
if (definition instanceof RecipientListDefinition) {
// special for RecipientListDefinition, as the processor is
wrapped in a pipeline as last
Pipeline pipeline = (Pipeline) processor;
- Iterator<Processor> it = pipeline.getProcessors().iterator();
+ Iterator<Processor> it = pipeline.next().iterator();
while (it.hasNext()) {
processor = it.next();
}
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
index c64cbc2..6b63560 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
@@ -329,6 +329,10 @@ Some unused methods have been removed from `CamelContext`
which were not part of
* getPollingConsumerServicePool
* setPollingConsumerServicePool
+==== Internal API changes
+
+Remove the method `getProcessors` from `Pipeline` as you should use the `next`
method instead to access a read-only view of the processors.
+
==== @Experimental
The `@Experimental` annotation is moved from `meta-annotations` JAR to
`camel-api`
