This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new ef63b0fbdac4 CAMEL-22634: camel-console - Add uri for processors
ef63b0fbdac4 is described below
commit ef63b0fbdac45c5273bdef987c127054411b2350
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Oct 30 10:28:10 2025 +0100
CAMEL-22634: camel-console - Add uri for processors
---
.../camel/impl/console/ProcessorDevConsole.java | 40 ++++++++++++++++++++--
.../apache/camel/impl/console/RouteDevConsole.java | 2 +-
...PollMBean.java => ManagedDestinationAware.java} | 22 +++---------
.../mbean/ManagedDynamicRouterMBean.java | 2 +-
.../api/management/mbean/ManagedEnricherMBean.java | 2 +-
.../management/mbean/ManagedPollEnricherMBean.java | 2 +-
.../api/management/mbean/ManagedPollMBean.java | 2 +-
.../mbean/ManagedSendDynamicProcessorMBean.java | 3 +-
.../mbean/ManagedSendProcessorMBean.java | 2 +-
.../api/management/mbean/ManagedWireTapMBean.java | 2 +-
.../management/mbean/ManagedDynamicRouter.java | 5 +++
.../camel/management/mbean/ManagedEnricher.java | 5 +++
.../management/mbean/ManagedPollEnricher.java | 5 +++
.../mbean/ManagedSendDynamicProcessor.java | 5 +++
.../management/mbean/ManagedWireTapProcessor.java | 5 +++
.../camel/management/ManagedDynamicRouterTest.java | 3 ++
.../camel/management/ManagedEnricherTest.java | 3 ++
.../camel/management/ManagedPollEnricherTest.java | 3 ++
...dPollEnricherTest.java => ManagedPollTest.java} | 13 +++----
.../ManagedSendDynamicProcessorTest.java | 3 ++
.../camel/management/ManagedWireTapTest.java | 3 ++
21 files changed, 96 insertions(+), 36 deletions(-)
diff --git
a/core/camel-console/src/main/java/org/apache/camel/impl/console/ProcessorDevConsole.java
b/core/camel-console/src/main/java/org/apache/camel/impl/console/ProcessorDevConsole.java
index d430b489c3ff..eee36667c00c 100644
---
a/core/camel-console/src/main/java/org/apache/camel/impl/console/ProcessorDevConsole.java
+++
b/core/camel-console/src/main/java/org/apache/camel/impl/console/ProcessorDevConsole.java
@@ -27,6 +27,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.CamelContext;
import org.apache.camel.Route;
import org.apache.camel.api.management.ManagedCamelContext;
+import org.apache.camel.api.management.mbean.ManagedDestinationAware;
import org.apache.camel.api.management.mbean.ManagedProcessorMBean;
import org.apache.camel.api.management.mbean.ManagedRouteMBean;
import org.apache.camel.spi.annotations.DevConsole;
@@ -109,10 +110,11 @@ public class ProcessorDevConsole extends
AbstractDevConsole {
// sort processors by index
mps.sort(Comparator.comparingInt(ManagedProcessorMBean::getIndex));
- includeProcessorsText(sb, max, counter, mps);
+ includeProcessorsText(getCamelContext(), sb, max, counter, mps);
}
public static void includeProcessorsText(
+ CamelContext camelContext,
StringBuilder sb, int max, AtomicInteger counter,
List<ManagedProcessorMBean> mps) {
for (ManagedProcessorMBean mp : mps) {
if (counter != null && counter.incrementAndGet() > max) {
@@ -131,7 +133,9 @@ public class ProcessorDevConsole extends AbstractDevConsole
{
sb.append(String.format("\n Note: %s", mp.getNote()));
}
sb.append(String.format("\n Processor: %s",
mp.getProcessorName()));
- sb.append(String.format("\n Step Id: %s", mp.getStepId()));
+ if (mp.getStepId() != null) {
+ sb.append(String.format("\n Step Id: %s",
mp.getStepId()));
+ }
sb.append(String.format("\n Level: %d", mp.getLevel()));
if (mp.getSourceLocation() != null) {
String loc = mp.getSourceLocation();
@@ -140,6 +144,13 @@ public class ProcessorDevConsole extends
AbstractDevConsole {
}
sb.append(String.format("\n Source: %s", loc));
}
+
+ // processors which can send to a destination (such as to/toD/poll
etc)
+ String destination = getDestination(camelContext, mp);
+ if (destination != null) {
+ sb.append(String.format("\n Uri: %s", destination));
+ }
+
sb.append(String.format("\n State: %s", mp.getState()));
sb.append(String.format("\n Disabled: %s",
mp.getDisabled()));
sb.append(String.format("\n Total: %s",
mp.getExchangesTotal()));
@@ -251,7 +262,9 @@ public class ProcessorDevConsole extends AbstractDevConsole
{
}
jo.put("state", mp.getState());
jo.put("disabled", mp.getDisabled());
- jo.put("stepId", mp.getStepId());
+ if (mp.getStepId() != null) {
+ jo.put("stepId", mp.getStepId());
+ }
// calculate end line number
ManagedProcessorMBean mp2 = i < mps.size() - 1 ? mps.get(i + 1) :
null;
@@ -286,11 +299,32 @@ public class ProcessorDevConsole extends
AbstractDevConsole {
}
jo.put("processor", mp.getProcessorName());
jo.put("level", mp.getLevel());
+
+ // processors which can send to a destination (such as to/toD/poll
etc)
+ String destination = getDestination(camelContext, mp);
+ if (destination != null) {
+ jo.put("uri", destination);
+ }
+
final JsonObject stats = getStatsObject(mp);
jo.put("statistics", stats);
}
}
+ private static String getDestination(CamelContext camelContext,
ManagedProcessorMBean mp) {
+ // processors which can send to a destination (such as to/toD/poll etc)
+ String kind = mp.getProcessorName();
+ if ("dynamicRouter".equals(kind) || "enrich".equals(kind) ||
"pollEnrich".equals(kind) || "poll".equals(kind)
+ || "toD".equals(kind) || "to".equals(kind) ||
"wireTap".equals(kind)) {
+ ManagedCamelContext mcc =
camelContext.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class);
+ ManagedDestinationAware mda =
mcc.getManagedProcessor(mp.getProcessorId(), ManagedDestinationAware.class);
+ if (mda != null) {
+ return mda.getDestination();
+ }
+ }
+ return null;
+ }
+
private static JsonObject getStatsObject(ManagedProcessorMBean mp) {
JsonObject stats = new JsonObject();
stats.put("idleSince", mp.getIdleSince());
diff --git
a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
index d81e4f237c4b..862f6ca5edf4 100644
---
a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
+++
b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
@@ -204,7 +204,7 @@ public class RouteDevConsole extends AbstractDevConsole {
// sort processors by index
mps.sort(Comparator.comparingInt(ManagedProcessorMBean::getIndex));
- ProcessorDevConsole.includeProcessorsText(sb, 0, null, mps);
+ ProcessorDevConsole.includeProcessorsText(getCamelContext(), sb, 0,
null, mps);
}
@Override
diff --git
a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedPollMBean.java
b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedDestinationAware.java
similarity index 56%
copy from
core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedPollMBean.java
copy to
core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedDestinationAware.java
index 3e2e90434abc..7167ebabe8f1 100644
---
a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedPollMBean.java
+++
b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedDestinationAware.java
@@ -16,25 +16,13 @@
*/
package org.apache.camel.api.management.mbean;
-import javax.management.openmbean.TabularData;
-
import org.apache.camel.api.management.ManagedAttribute;
-import org.apache.camel.api.management.ManagedOperation;
-public interface ManagedPollMBean extends ManagedProcessorMBean,
ManagedExtendedInformation {
+/**
+ * Processors that can send messages to endpoints, either static or dynamic.
+ */
+public interface ManagedDestinationAware extends ManagedProcessorMBean {
- @ManagedAttribute(description = "Destination as Endpoint URI",
- mask = true)
+ @ManagedAttribute(description = "Destination as endpoint URI (static) or
expression (dynamic)", mask = true)
String getDestination();
-
- @ManagedAttribute(description = "Variable to store the received message
body (only body, not headers)")
- String getVariableReceive();
-
- @ManagedAttribute(description = "Timeout in millis when polling from the
external service")
- Long getTimeout();
-
- @Override
- @ManagedOperation(description = "Statistics of the endpoints that has been
poll enriched from")
- TabularData extendedInformation();
-
}
diff --git
a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedDynamicRouterMBean.java
b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedDynamicRouterMBean.java
index dd999d727d4a..eb4a0a8ecc41 100644
---
a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedDynamicRouterMBean.java
+++
b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedDynamicRouterMBean.java
@@ -21,7 +21,7 @@ import javax.management.openmbean.TabularData;
import org.apache.camel.api.management.ManagedAttribute;
import org.apache.camel.api.management.ManagedOperation;
-public interface ManagedDynamicRouterMBean extends ManagedProcessorMBean,
ManagedExtendedInformation {
+public interface ManagedDynamicRouterMBean extends ManagedProcessorMBean,
ManagedExtendedInformation, ManagedDestinationAware {
@ManagedAttribute(description = "The language for the expression")
String getExpressionLanguage();
diff --git
a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedEnricherMBean.java
b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedEnricherMBean.java
index e8183ab20ea6..1b8fa73bb128 100644
---
a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedEnricherMBean.java
+++
b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedEnricherMBean.java
@@ -21,7 +21,7 @@ import javax.management.openmbean.TabularData;
import org.apache.camel.api.management.ManagedAttribute;
import org.apache.camel.api.management.ManagedOperation;
-public interface ManagedEnricherMBean extends ManagedProcessorMBean,
ManagedExtendedInformation {
+public interface ManagedEnricherMBean extends ManagedProcessorMBean,
ManagedExtendedInformation, ManagedDestinationAware {
@ManagedAttribute(description = "The language for the expression")
String getExpressionLanguage();
diff --git
a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedPollEnricherMBean.java
b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedPollEnricherMBean.java
index 439a86750338..e5de379a21ac 100644
---
a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedPollEnricherMBean.java
+++
b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedPollEnricherMBean.java
@@ -21,7 +21,7 @@ import javax.management.openmbean.TabularData;
import org.apache.camel.api.management.ManagedAttribute;
import org.apache.camel.api.management.ManagedOperation;
-public interface ManagedPollEnricherMBean extends ManagedProcessorMBean,
ManagedExtendedInformation {
+public interface ManagedPollEnricherMBean extends ManagedProcessorMBean,
ManagedExtendedInformation, ManagedDestinationAware {
@ManagedAttribute(description = "The language for the expression")
String getExpressionLanguage();
diff --git
a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedPollMBean.java
b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedPollMBean.java
index 3e2e90434abc..c35375e595c5 100644
---
a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedPollMBean.java
+++
b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedPollMBean.java
@@ -21,7 +21,7 @@ import javax.management.openmbean.TabularData;
import org.apache.camel.api.management.ManagedAttribute;
import org.apache.camel.api.management.ManagedOperation;
-public interface ManagedPollMBean extends ManagedProcessorMBean,
ManagedExtendedInformation {
+public interface ManagedPollMBean extends ManagedProcessorMBean,
ManagedExtendedInformation, ManagedDestinationAware {
@ManagedAttribute(description = "Destination as Endpoint URI",
mask = true)
diff --git
a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedSendDynamicProcessorMBean.java
b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedSendDynamicProcessorMBean.java
index 11224a5884da..039582dc2441 100644
---
a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedSendDynamicProcessorMBean.java
+++
b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedSendDynamicProcessorMBean.java
@@ -21,7 +21,8 @@ import javax.management.openmbean.TabularData;
import org.apache.camel.api.management.ManagedAttribute;
import org.apache.camel.api.management.ManagedOperation;
-public interface ManagedSendDynamicProcessorMBean extends
ManagedProcessorMBean, ManagedExtendedInformation {
+public interface ManagedSendDynamicProcessorMBean
+ extends ManagedProcessorMBean, ManagedExtendedInformation,
ManagedDestinationAware {
@ManagedAttribute(description = "The uri of the endpoint to send to. The
uri can be dynamic computed using the expressions.",
mask = true)
diff --git
a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedSendProcessorMBean.java
b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedSendProcessorMBean.java
index e0e31150032b..f09b190e41b4 100644
---
a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedSendProcessorMBean.java
+++
b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedSendProcessorMBean.java
@@ -21,7 +21,7 @@ import javax.management.openmbean.TabularData;
import org.apache.camel.api.management.ManagedAttribute;
import org.apache.camel.api.management.ManagedOperation;
-public interface ManagedSendProcessorMBean extends ManagedProcessorMBean,
ManagedExtendedInformation {
+public interface ManagedSendProcessorMBean extends ManagedProcessorMBean,
ManagedExtendedInformation, ManagedDestinationAware {
@ManagedAttribute(description = "Destination as Endpoint URI", mask = true)
String getDestination();
diff --git
a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedWireTapMBean.java
b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedWireTapMBean.java
index 58661d0d8fb3..6343078c0cfa 100644
---
a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedWireTapMBean.java
+++
b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedWireTapMBean.java
@@ -21,7 +21,7 @@ import javax.management.openmbean.TabularData;
import org.apache.camel.api.management.ManagedAttribute;
import org.apache.camel.api.management.ManagedOperation;
-public interface ManagedWireTapMBean extends ManagedProcessorMBean,
ManagedExtendedInformation {
+public interface ManagedWireTapMBean extends ManagedProcessorMBean,
ManagedExtendedInformation, ManagedDestinationAware {
@ManagedAttribute(description = "The uri of the endpoint to wiretap to.
The uri can be dynamic computed using the expressions.",
mask = true)
diff --git
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDynamicRouter.java
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDynamicRouter.java
index b0632f41cc3a..dadb79d8f63c 100644
---
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDynamicRouter.java
+++
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedDynamicRouter.java
@@ -73,6 +73,11 @@ public class ManagedDynamicRouter extends ManagedProcessor
implements ManagedDyn
}
}
+ @Override
+ public String getDestination() {
+ return uri;
+ }
+
@Override
public Boolean getSupportExtendedInformation() {
return true;
diff --git
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEnricher.java
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEnricher.java
index 4e378e8ad69c..dff6cdc211a6 100644
---
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEnricher.java
+++
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedEnricher.java
@@ -78,6 +78,11 @@ public class ManagedEnricher extends ManagedProcessor
implements ManagedEnricher
return (EnrichDefinition) super.getDefinition();
}
+ @Override
+ public String getDestination() {
+ return uri;
+ }
+
@Override
public String getExpressionLanguage() {
return getDefinition().getExpression().getLanguage();
diff --git
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedPollEnricher.java
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedPollEnricher.java
index ae229749b091..0f9a9c89d6d4 100644
---
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedPollEnricher.java
+++
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedPollEnricher.java
@@ -78,6 +78,11 @@ public class ManagedPollEnricher extends ManagedProcessor
implements ManagedPoll
return (PollEnrichDefinition) super.getDefinition();
}
+ @Override
+ public String getDestination() {
+ return uri;
+ }
+
@Override
public String getExpressionLanguage() {
return getDefinition().getExpression().getLanguage();
diff --git
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSendDynamicProcessor.java
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSendDynamicProcessor.java
index b8d3078fd886..4c8b51a4072c 100644
---
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSendDynamicProcessor.java
+++
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedSendDynamicProcessor.java
@@ -74,6 +74,11 @@ public class ManagedSendDynamicProcessor extends
ManagedProcessor implements Man
return (SendDynamicProcessor) super.getProcessor();
}
+ @Override
+ public String getDestination() {
+ return uri;
+ }
+
@Override
public String getUri() {
return uri;
diff --git
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedWireTapProcessor.java
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedWireTapProcessor.java
index cab972b04a00..2dcf55c7fa31 100644
---
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedWireTapProcessor.java
+++
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedWireTapProcessor.java
@@ -69,6 +69,11 @@ public class ManagedWireTapProcessor extends
ManagedProcessor implements Managed
return true;
}
+ @Override
+ public String getDestination() {
+ return uri;
+ }
+
@Override
public WireTapProcessor getProcessor() {
return (WireTapProcessor) super.getProcessor();
diff --git
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedDynamicRouterTest.java
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedDynamicRouterTest.java
index ce3ed34613ac..16edd51f4f03 100644
---
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedDynamicRouterTest.java
+++
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedDynamicRouterTest.java
@@ -79,6 +79,9 @@ public class ManagedDynamicRouterTest extends
ManagementTestSupport {
String uri = (String) mbeanServer.getAttribute(on, "Expression");
assertEquals("whereTo", uri);
+ String destination = (String) mbeanServer.getAttribute(on,
"Destination");
+ assertEquals("whereTo", destination);
+
TabularData data = (TabularData) mbeanServer.invoke(on,
"extendedInformation", null, null);
assertNotNull(data);
assertEquals(2, data.size());
diff --git
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedEnricherTest.java
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedEnricherTest.java
index 88eb7d71875f..8623d89d4a2f 100644
---
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedEnricherTest.java
+++
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedEnricherTest.java
@@ -79,6 +79,9 @@ public class ManagedEnricherTest extends
ManagementTestSupport {
String uri = (String) mbeanServer.getAttribute(on, "Expression");
assertEquals("direct:${header.whereto}", uri);
+ String destination = (String) mbeanServer.getAttribute(on,
"Destination");
+ assertEquals("direct:${header.whereto}", destination);
+
TabularData data = (TabularData) mbeanServer.invoke(on,
"extendedInformation", null, null);
assertNotNull(data);
assertEquals(2, data.size());
diff --git
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedPollEnricherTest.java
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedPollEnricherTest.java
index 7969ccb9a327..8963fa213f9e 100644
---
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedPollEnricherTest.java
+++
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedPollEnricherTest.java
@@ -78,6 +78,9 @@ public class ManagedPollEnricherTest extends
ManagementTestSupport {
String uri = (String) mbeanServer.getAttribute(on, "Expression");
assertEquals("seda:${header.whereto}", uri);
+ String destination = (String) mbeanServer.getAttribute(on,
"Destination");
+ assertEquals("seda:${header.whereto}", destination);
+
TabularData data = (TabularData) mbeanServer.invoke(on,
"extendedInformation", null, null);
assertNotNull(data);
assertEquals(1, data.size());
diff --git
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedPollEnricherTest.java
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedPollTest.java
similarity index 87%
copy from
core/camel-management/src/test/java/org/apache/camel/management/ManagedPollEnricherTest.java
copy to
core/camel-management/src/test/java/org/apache/camel/management/ManagedPollTest.java
index 7969ccb9a327..f553ad918818 100644
---
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedPollEnricherTest.java
+++
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedPollTest.java
@@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@DisabledOnOs(OS.AIX)
-public class ManagedPollEnricherTest extends ManagementTestSupport {
+public class ManagedPollTest extends ManagementTestSupport {
@Override
protected CamelContext createCamelContext() throws Exception {
@@ -44,7 +44,7 @@ public class ManagedPollEnricherTest extends
ManagementTestSupport {
}
@Test
- public void testManagePollEnricher() throws Exception {
+ public void testManagePoll() throws Exception {
MockEndpoint foo = getMockEndpoint("mock:foo");
foo.expectedBodiesReceived("Hello World");
@@ -72,11 +72,8 @@ public class ManagedPollEnricherTest extends
ManagementTestSupport {
Long timout = (Long) mbeanServer.getAttribute(on, "Timeout");
assertEquals(1000, timout.longValue());
- String lan = (String) mbeanServer.getAttribute(on,
"ExpressionLanguage");
- assertEquals("simple", lan);
-
- String uri = (String) mbeanServer.getAttribute(on, "Expression");
- assertEquals("seda:${header.whereto}", uri);
+ String destination = (String) mbeanServer.getAttribute(on,
"Destination");
+ assertEquals("seda:${header.whereto}", destination);
TabularData data = (TabularData) mbeanServer.invoke(on,
"extendedInformation", null, null);
assertNotNull(data);
@@ -89,7 +86,7 @@ public class ManagedPollEnricherTest extends
ManagementTestSupport {
@Override
public void configure() {
from("direct:start")
-
.pollEnrich().simple("seda:${header.whereto}").timeout(1000).id("mysend")
+ .poll("seda:${header.whereto}", 1000).id("mysend")
.to("mock:foo");
}
};
diff --git
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedSendDynamicProcessorTest.java
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedSendDynamicProcessorTest.java
index 11e35f116947..1d5605bdbdb8 100644
---
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedSendDynamicProcessorTest.java
+++
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedSendDynamicProcessorTest.java
@@ -79,6 +79,9 @@ public class ManagedSendDynamicProcessorTest extends
ManagementTestSupport {
String uri = (String) mbeanServer.getAttribute(on, "Uri");
assertEquals("direct:${header.whereto}", uri);
+ String destination = (String) mbeanServer.getAttribute(on,
"Destination");
+ assertEquals("direct:${header.whereto}", destination);
+
Boolean optimised = (Boolean) mbeanServer.getAttribute(on,
"Optimised");
assertFalse(optimised);
diff --git
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedWireTapTest.java
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedWireTapTest.java
index 0f54c57e7106..a3ca570ef677 100644
---
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedWireTapTest.java
+++
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedWireTapTest.java
@@ -77,6 +77,9 @@ public class ManagedWireTapTest extends ManagementTestSupport
{
String uri = (String) mbeanServer.getAttribute(on, "Uri");
assertEquals("direct:${header.whereto}", uri);
+ String destination = (String) mbeanServer.getAttribute(on,
"Destination");
+ assertEquals("direct:${header.whereto}", destination);
+
Boolean dynamicUri = (Boolean) mbeanServer.getAttribute(on,
"DynamicUri");
assertTrue(dynamicUri);
