You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2021/12/21 08:51:08 UTC
[camel] branch main updated: CAMEL-17361: camel-management - Move routecontroller mbeans to services
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 e834245 CAMEL-17361: camel-management - Move routecontroller mbeans to services
e834245 is described below
commit e834245183e11e152a2c29b05ecc4ff845f60510
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 21 09:48:39 2021 +0100
CAMEL-17361: camel-management - Move routecontroller mbeans to services
---
.../apache/camel/management/DefaultManagementObjectNameStrategy.java | 3 +--
.../org/apache/camel/management/ManagedNonManagedServiceTest.java | 2 +-
.../management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java | 2 +-
.../java/org/apache/camel/management/ManagedRouteAddRemoveTest.java | 2 +-
.../camel/management/ManagedSupervisingRouteControllerTest.java | 3 +--
docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc | 5 +++++
docs/user-manual/modules/ROOT/pages/route-controller.adoc | 2 +-
7 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectNameStrategy.java b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectNameStrategy.java
index 438b35c..123929c 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectNameStrategy.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectNameStrategy.java
@@ -69,7 +69,6 @@ public class DefaultManagementObjectNameStrategy implements ManagementObjectName
public static final String KEY_TYPE = "type";
public static final String KEY_CONTEXT = "context";
public static final String TYPE_CONTEXT = "context";
- public static final String TYPE_ROUTE_CONTROLLER = "routecontrollers";
public static final String TYPE_HEALTH = "health";
public static final String TYPE_ENDPOINT = "endpoints";
public static final String TYPE_DATAFORMAT = "dataformats";
@@ -238,7 +237,7 @@ public class DefaultManagementObjectNameStrategy implements ManagementObjectName
StringBuilder buffer = new StringBuilder();
buffer.append(domainName).append(":");
buffer.append(KEY_CONTEXT + "=").append(getContextId(managementName)).append(",");
- buffer.append(KEY_TYPE + "=" + TYPE_ROUTE_CONTROLLER + ",");
+ buffer.append(KEY_TYPE + "=" + TYPE_SERVICE + ",");
buffer.append(KEY_NAME + "=").append(routeController.getClass().getSimpleName());
return createObjectName(buffer);
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedNonManagedServiceTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedNonManagedServiceTest.java
index 635aaad..22e9d59 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedNonManagedServiceTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedNonManagedServiceTest.java
@@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
@DisabledOnOs(OS.AIX)
public class ManagedNonManagedServiceTest extends ManagementTestSupport {
- private static final int SERVICES = 12;
+ private static final int SERVICES = 13;
@Test
public void testService() throws Exception {
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java
index 586a764..f18d3c6 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@DisabledOnOs(OS.AIX)
public class ManagedProducerRouteAddRemoveRegisterAlwaysTest extends ManagementTestSupport {
- private static final int SERVICES = 12;
+ private static final int SERVICES = 13;
@Override
protected CamelContext createCamelContext() throws Exception {
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java
index 8800c7d..ac592b4 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java
@@ -40,7 +40,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@DisabledOnOs(OS.AIX)
public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
- private static final int SERVICES = 12;
+ private static final int SERVICES = 13;
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedSupervisingRouteControllerTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedSupervisingRouteControllerTest.java
index 2faa7fd..51b877f 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedSupervisingRouteControllerTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedSupervisingRouteControllerTest.java
@@ -37,7 +37,6 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
-import static org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_ROUTE_CONTROLLER;
import static org.awaitility.Awaitility.await;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -63,7 +62,7 @@ public class ManagedSupervisingRouteControllerTest extends ManagementTestSupport
MBeanServer mbeanServer = getMBeanServer();
// get the object name for the delayer
- ObjectName on = getCamelObjectName(TYPE_ROUTE_CONTROLLER, "DefaultSupervisingRouteController");
+ ObjectName on = getCamelObjectName("services", "DefaultSupervisingRouteController");
assertTrue(mbeanServer.isRegistered(on));
Boolean enabled = (Boolean) mbeanServer.getAttribute(on, "Enabled");
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc
index 6eccf35..11c130c 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc
@@ -10,6 +10,11 @@ from both 3.0 to 3.1 and 3.1 to 3.2.
Added `getScheme` method to `org.apache.camel.spi.Resource`.
+=== camel-management
+
+The route controller MBeans are moved from `routecontrollers` to the existing `services`
+node in the JMX MBean tree.
+
=== camel-yaml-dsl
Removed `steps` from `route` because steps should only be configured on `from` making
diff --git a/docs/user-manual/modules/ROOT/pages/route-controller.adoc b/docs/user-manual/modules/ROOT/pages/route-controller.adoc
index 0d97e4d..f122281 100644
--- a/docs/user-manual/modules/ROOT/pages/route-controller.adoc
+++ b/docs/user-manual/modules/ROOT/pages/route-controller.adoc
@@ -180,7 +180,7 @@ camel.springboot.routeControllerExcludeRoutes = aws*
== JMX management
-The route controllers are manageable in JMX, where you can find their MBean under the `routecontrollers` node.
+The route controllers are manageable in JMX, where you can find their MBean under the `services` node.
NOTE: To use JMX with Camel then `camel-management` JAR must be included in the classpath.