You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2018/10/12 11:26:44 UTC
[camel] 40/44: Rename ManagementNamingStrategy to
ManagementObjectNameStrategy
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 645f965ff36fd95959891f733a5b14daec92a83c
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Oct 12 09:26:40 2018 +0200
Rename ManagementNamingStrategy to ManagementObjectNameStrategy
# Conflicts:
# camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierExchangeSentParallelTest.java
---
.../java/org/apache/camel/spi/ManagementAgent.java | 2 +-
...tegy.java => ManagementObjectNameStrategy.java} | 4 +--
.../org/apache/camel/spi/ManagementStrategy.java | 6 ++--
.../component/controlbus/ControlBusProducer.java | 4 +--
.../org/apache/camel/impl/DefaultCamelContext.java | 8 ++---
.../DefaultManagementLifecycleStrategy.java | 6 ++--
...va => DefaultManagementObjectNameStrategy.java} | 8 ++---
.../management/DefaultManagementStrategy.java | 24 +++++++-------
.../management/ManagedManagementStrategy.java | 37 +++++++++++-----------
.../management/mbean/ManagedCamelContext.java | 2 +-
.../ManagedNamePatternIncludeHostNameTest.java | 2 +-
.../core/xml/AbstractCamelContextFactoryBean.java | 10 +++---
.../camel-jmx/src/main/docs/jmx-component.adoc | 6 ++--
.../camel/spring/boot/CamelAutoConfiguration.java | 6 ++--
.../SpringJmxDumpRouteAsXmlIncludeHostNameTest.xml | 2 +-
.../managedNamePatternFixedIncludeHostNameTest.xml | 2 +-
16 files changed, 63 insertions(+), 66 deletions(-)
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ManagementAgent.java b/camel-api/src/main/java/org/apache/camel/spi/ManagementAgent.java
index 7c7ee07..75390db 100644
--- a/camel-api/src/main/java/org/apache/camel/spi/ManagementAgent.java
+++ b/camel-api/src/main/java/org/apache/camel/spi/ManagementAgent.java
@@ -278,7 +278,7 @@ public interface ManagementAgent extends Service {
Boolean getIncludeHostName();
/**
- * Sets whether to include host name in the {@link ManagementNamingStrategy}.
+ * Sets whether to include host name in the {@link ManagementObjectNameStrategy}.
* <p/>
* By default this is turned off from Camel 2.13 onwards, but this option
* can be set to <tt>true</tt> to include the hostname as Camel 2.12 or
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ManagementNamingStrategy.java b/camel-api/src/main/java/org/apache/camel/spi/ManagementObjectNameStrategy.java
similarity index 97%
rename from camel-api/src/main/java/org/apache/camel/spi/ManagementNamingStrategy.java
rename to camel-api/src/main/java/org/apache/camel/spi/ManagementObjectNameStrategy.java
index f8074dc..808ad10 100644
--- a/camel-api/src/main/java/org/apache/camel/spi/ManagementNamingStrategy.java
+++ b/camel-api/src/main/java/org/apache/camel/spi/ManagementObjectNameStrategy.java
@@ -36,9 +36,7 @@ import org.apache.camel.cluster.CamelClusterService;
/**
* Strategy for computing {@link ObjectName} names for the various beans that Camel register for management.
*/
-public interface ManagementNamingStrategy {
-
- // TODO: Should be renamed to ManagementObjectNameStrategy
+public interface ManagementObjectNameStrategy {
ObjectName getObjectNameForCamelContext(String managementName, String name) throws MalformedObjectNameException;
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ManagementStrategy.java b/camel-api/src/main/java/org/apache/camel/spi/ManagementStrategy.java
index 7fb8d47..49573c4 100644
--- a/camel-api/src/main/java/org/apache/camel/spi/ManagementStrategy.java
+++ b/camel-api/src/main/java/org/apache/camel/spi/ManagementStrategy.java
@@ -28,7 +28,7 @@ import org.apache.camel.Service;
*
* @see org.apache.camel.spi.EventNotifier
* @see org.apache.camel.spi.EventFactory
- * @see org.apache.camel.spi.ManagementNamingStrategy
+ * @see ManagementObjectNameStrategy
* @see org.apache.camel.spi.ManagementAgent
*/
public interface ManagementStrategy extends Service {
@@ -151,14 +151,14 @@ public interface ManagementStrategy extends Service {
*
* @return naming strategy
*/
- ManagementNamingStrategy getManagementNamingStrategy();
+ ManagementObjectNameStrategy getManagementObjectNameStrategy();
/**
* Sets the naming strategy to use
*
* @param strategy naming strategy
*/
- void setManagementNamingStrategy(ManagementNamingStrategy strategy);
+ void setManagementObjectNameStrategy(ManagementObjectNameStrategy strategy);
/**
* Gets the object strategy to use
diff --git a/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusProducer.java b/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusProducer.java
index 127af96..8949269 100644
--- a/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusProducer.java
+++ b/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusProducer.java
@@ -198,11 +198,11 @@ public class ControlBusProducer extends DefaultAsyncProducer {
String operation;
if (id == null) {
CamelContext camelContext = getEndpoint().getCamelContext();
- on = getEndpoint().getCamelContext().getManagementStrategy().getManagementNamingStrategy().getObjectNameForCamelContext(camelContext);
+ on = getEndpoint().getCamelContext().getManagementStrategy().getManagementObjectNameStrategy().getObjectNameForCamelContext(camelContext);
operation = "dumpRoutesStatsAsXml";
} else {
Route route = getEndpoint().getCamelContext().getRoute(id);
- on = getEndpoint().getCamelContext().getManagementStrategy().getManagementNamingStrategy().getObjectNameForRoute(route);
+ on = getEndpoint().getCamelContext().getManagementStrategy().getManagementObjectNameStrategy().getObjectNameForRoute(route);
operation = "dumpRouteStatsAsXml";
}
if (on != null) {
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 af89cbb..a68ec91 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
@@ -120,8 +120,8 @@ import org.apache.camel.processor.interceptor.BacklogDebugger;
import org.apache.camel.processor.interceptor.BacklogTracer;
import org.apache.camel.processor.interceptor.Debug;
import org.apache.camel.processor.interceptor.HandleFault;
-import org.apache.camel.runtimecatalog.impl.DefaultRuntimeCamelCatalog;
import org.apache.camel.runtimecatalog.RuntimeCamelCatalog;
+import org.apache.camel.runtimecatalog.impl.DefaultRuntimeCamelCatalog;
import org.apache.camel.spi.AsyncProcessorAwaitManager;
import org.apache.camel.spi.CamelContextNameStrategy;
import org.apache.camel.spi.CamelContextTracker;
@@ -926,7 +926,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
// processor may be null if its anonymous inner class or as lambda
if (def != null) {
try {
- ObjectName on = getManagementStrategy().getManagementNamingStrategy().getObjectNameForProcessor(this, processor, def);
+ ObjectName on = getManagementStrategy().getManagementObjectNameStrategy().getObjectNameForProcessor(this, processor, def);
return getManagementStrategy().getManagementAgent().newProxyClient(on, type);
} catch (MalformedObjectNameException e) {
throw RuntimeCamelException.wrapRuntimeCamelException(e);
@@ -946,7 +946,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
if (route != null) {
try {
- ObjectName on = getManagementStrategy().getManagementNamingStrategy().getObjectNameForRoute(route);
+ ObjectName on = getManagementStrategy().getManagementObjectNameStrategy().getObjectNameForRoute(route);
return getManagementStrategy().getManagementAgent().newProxyClient(on, type);
} catch (MalformedObjectNameException e) {
throw RuntimeCamelException.wrapRuntimeCamelException(e);
@@ -963,7 +963,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
}
try {
- ObjectName on = getManagementStrategy().getManagementNamingStrategy().getObjectNameForCamelContext(this);
+ ObjectName on = getManagementStrategy().getManagementObjectNameStrategy().getObjectNameForCamelContext(this);
return getManagementStrategy().getManagementAgent().newProxyClient(on, ManagedCamelContextMBean.class);
} catch (MalformedObjectNameException e) {
throw RuntimeCamelException.wrapRuntimeCamelException(e);
diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
index 1971782..9a006b4 100644
--- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
@@ -157,7 +157,7 @@ public class DefaultManagementLifecycleStrategy extends ServiceSupport implement
try {
boolean done = false;
while (!done) {
- ObjectName on = getManagementStrategy().getManagementNamingStrategy().getObjectNameForCamelContext(managementName, name);
+ ObjectName on = getManagementStrategy().getManagementObjectNameStrategy().getObjectNameForCamelContext(managementName, name);
boolean exists = getManagementStrategy().isManaged(mc, on);
if (!exists) {
done = true;
@@ -247,7 +247,7 @@ public class DefaultManagementLifecycleStrategy extends ServiceSupport implement
while (!done) {
// compute the next name
newName = strategy.getNextName();
- ObjectName on = getManagementStrategy().getManagementNamingStrategy().getObjectNameForCamelContext(newName, name);
+ ObjectName on = getManagementStrategy().getManagementObjectNameStrategy().getObjectNameForCamelContext(newName, name);
done = !getManagementStrategy().isManaged(mc, on);
if (log.isTraceEnabled()) {
log.trace("Using name: {} in ObjectName[{}] exists? {}", name, on, done);
@@ -633,7 +633,7 @@ public class DefaultManagementLifecycleStrategy extends ServiceSupport implement
Object mr = getManagementObjectStrategy().getManagedObjectForRoute(camelContext, route);
// skip unmanaged routes
- if (!getManagementStrategy().isManaged(mr)) {
+ if (!getManagementStrategy().isManaged(mr, null)) {
log.trace("The route is not managed: {}", route);
continue;
}
diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementObjectNameStrategy.java
similarity index 98%
rename from camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java
rename to camel-core/src/main/java/org/apache/camel/management/DefaultManagementObjectNameStrategy.java
index e640792..804593c 100644
--- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementObjectNameStrategy.java
@@ -39,7 +39,7 @@ import org.apache.camel.cluster.CamelClusterService;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.EventNotifier;
import org.apache.camel.spi.InterceptStrategy;
-import org.apache.camel.spi.ManagementNamingStrategy;
+import org.apache.camel.spi.ManagementObjectNameStrategy;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.InetAddressUtil;
import org.apache.camel.util.ObjectHelper;
@@ -48,7 +48,7 @@ import org.apache.camel.util.URISupport;
/**
* Naming strategy used when registering MBeans.
*/
-public class DefaultManagementNamingStrategy implements ManagementNamingStrategy, CamelContextAware {
+public class DefaultManagementObjectNameStrategy implements ManagementObjectNameStrategy, CamelContextAware {
public static final String VALUE_UNKNOWN = "unknown";
public static final String KEY_NAME = "name";
public static final String KEY_TYPE = "type";
@@ -74,12 +74,12 @@ public class DefaultManagementNamingStrategy implements ManagementNamingStrategy
protected String hostName = "localhost";
protected CamelContext camelContext;
- public DefaultManagementNamingStrategy() {
+ public DefaultManagementObjectNameStrategy() {
this("org.apache.camel");
// default constructor needed for <bean> style configuration
}
- public DefaultManagementNamingStrategy(String domainName) {
+ public DefaultManagementObjectNameStrategy(String domainName) {
if (domainName != null) {
this.domainName = domainName;
}
diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java
index 088af57..b2f1a93 100644
--- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java
@@ -27,7 +27,7 @@ import org.apache.camel.spi.CamelEvent;
import org.apache.camel.spi.EventFactory;
import org.apache.camel.spi.EventNotifier;
import org.apache.camel.spi.ManagementAgent;
-import org.apache.camel.spi.ManagementNamingStrategy;
+import org.apache.camel.spi.ManagementObjectNameStrategy;
import org.apache.camel.spi.ManagementObjectStrategy;
import org.apache.camel.spi.ManagementStrategy;
import org.apache.camel.support.ServiceHelper;
@@ -53,7 +53,7 @@ public class DefaultManagementStrategy extends ServiceSupport implements Managem
private static final Logger LOG = LoggerFactory.getLogger(DefaultManagementStrategy.class);
private List<EventNotifier> eventNotifiers = new CopyOnWriteArrayList<>();
private EventFactory eventFactory = new DefaultEventFactory();
- private ManagementNamingStrategy managementNamingStrategy;
+ private ManagementObjectNameStrategy managementObjectNameStrategy;
private ManagementObjectStrategy managementObjectStrategy;
private ManagementAgent managementAgent;
private CamelContext camelContext;
@@ -89,15 +89,15 @@ public class DefaultManagementStrategy extends ServiceSupport implements Managem
this.eventFactory = eventFactory;
}
- public ManagementNamingStrategy getManagementNamingStrategy() {
- if (managementNamingStrategy == null) {
- managementNamingStrategy = new DefaultManagementNamingStrategy();
+ public ManagementObjectNameStrategy getManagementObjectNameStrategy() {
+ if (managementObjectNameStrategy == null) {
+ managementObjectNameStrategy = new DefaultManagementObjectNameStrategy();
}
- return managementNamingStrategy;
+ return managementObjectNameStrategy;
}
- public void setManagementNamingStrategy(ManagementNamingStrategy managementNamingStrategy) {
- this.managementNamingStrategy = managementNamingStrategy;
+ public void setManagementObjectNameStrategy(ManagementObjectNameStrategy managementObjectNameStrategy) {
+ this.managementObjectNameStrategy = managementObjectNameStrategy;
}
public ManagementObjectStrategy getManagementObjectStrategy() {
@@ -191,12 +191,12 @@ public class DefaultManagementStrategy extends ServiceSupport implements Managem
if (managementAgent != null) {
ServiceHelper.startService(managementAgent);
// set the naming strategy using the domain name from the agent
- if (managementNamingStrategy == null) {
- setManagementNamingStrategy(new DefaultManagementNamingStrategy(managementAgent.getMBeanObjectDomainName()));
+ if (managementObjectNameStrategy == null) {
+ setManagementObjectNameStrategy(new DefaultManagementObjectNameStrategy(managementAgent.getMBeanObjectDomainName()));
}
}
- if (managementNamingStrategy instanceof CamelContextAware) {
- ((CamelContextAware) managementNamingStrategy).setCamelContext(getCamelContext());
+ if (managementObjectNameStrategy instanceof CamelContextAware) {
+ ((CamelContextAware) managementObjectNameStrategy).setCamelContext(getCamelContext());
}
}
diff --git a/camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java b/camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java
index f6211a5..a00e329 100644
--- a/camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java
@@ -38,7 +38,6 @@ import org.apache.camel.management.mbean.ManagedRoute;
import org.apache.camel.management.mbean.ManagedRouteController;
import org.apache.camel.management.mbean.ManagedService;
import org.apache.camel.management.mbean.ManagedThreadPool;
-import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.spi.ManagementAgent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -87,54 +86,54 @@ public class ManagedManagementStrategy extends DefaultManagementStrategy {
if (managedObject instanceof ManagedCamelContext) {
ManagedCamelContext mcc = (ManagedCamelContext) managedObject;
- objectName = getManagementNamingStrategy().getObjectNameForCamelContext(mcc.getContext());
+ objectName = getManagementObjectNameStrategy().getObjectNameForCamelContext(mcc.getContext());
} else if (managedObject instanceof ManagedCamelHealth) {
ManagedCamelHealth mch = (ManagedCamelHealth) managedObject;
- objectName = getManagementNamingStrategy().getObjectNameForCamelHealth(mch.getContext());
+ objectName = getManagementObjectNameStrategy().getObjectNameForCamelHealth(mch.getContext());
} else if (managedObject instanceof ManagedRouteController) {
ManagedRouteController mrc = (ManagedRouteController) managedObject;
- objectName = getManagementNamingStrategy().getObjectNameForRouteController(mrc.getContext());
+ objectName = getManagementObjectNameStrategy().getObjectNameForRouteController(mrc.getContext());
} else if (managedObject instanceof ManagedComponent) {
ManagedComponent mc = (ManagedComponent) managedObject;
- objectName = getManagementNamingStrategy().getObjectNameForComponent(mc.getComponent(), mc.getComponentName());
+ objectName = getManagementObjectNameStrategy().getObjectNameForComponent(mc.getComponent(), mc.getComponentName());
} else if (managedObject instanceof ManagedDataFormat) {
ManagedDataFormat md = (ManagedDataFormat) managedObject;
- objectName = getManagementNamingStrategy().getObjectNameForDataFormat(md.getContext(), md.getDataFormat());
+ objectName = getManagementObjectNameStrategy().getObjectNameForDataFormat(md.getContext(), md.getDataFormat());
} else if (managedObject instanceof ManagedEndpoint) {
ManagedEndpoint me = (ManagedEndpoint) managedObject;
- objectName = getManagementNamingStrategy().getObjectNameForEndpoint(me.getEndpoint());
+ objectName = getManagementObjectNameStrategy().getObjectNameForEndpoint(me.getEndpoint());
} else if (managedObject instanceof Endpoint) {
- objectName = getManagementNamingStrategy().getObjectNameForEndpoint((Endpoint) managedObject);
+ objectName = getManagementObjectNameStrategy().getObjectNameForEndpoint((Endpoint) managedObject);
} else if (managedObject instanceof ManagedRoute) {
ManagedRoute mr = (ManagedRoute) managedObject;
- objectName = getManagementNamingStrategy().getObjectNameForRoute(mr.getRoute());
+ objectName = getManagementObjectNameStrategy().getObjectNameForRoute(mr.getRoute());
} else if (managedObject instanceof ManagedErrorHandler) {
ManagedErrorHandler meh = (ManagedErrorHandler) managedObject;
- objectName = getManagementNamingStrategy().getObjectNameForErrorHandler(meh.getRouteContext(), meh.getErrorHandler(), meh.getErrorHandlerBuilder());
+ objectName = getManagementObjectNameStrategy().getObjectNameForErrorHandler(meh.getRouteContext(), meh.getErrorHandler(), meh.getErrorHandlerBuilder());
} else if (managedObject instanceof ManagedProcessor) {
ManagedProcessor mp = (ManagedProcessor) managedObject;
- objectName = getManagementNamingStrategy().getObjectNameForProcessor(mp.getContext(), mp.getProcessor(), mp.getDefinition());
+ objectName = getManagementObjectNameStrategy().getObjectNameForProcessor(mp.getContext(), mp.getProcessor(), mp.getDefinition());
} else if (managedObject instanceof ManagedConsumer) {
ManagedConsumer ms = (ManagedConsumer) managedObject;
- objectName = getManagementNamingStrategy().getObjectNameForConsumer(ms.getContext(), ms.getConsumer());
+ objectName = getManagementObjectNameStrategy().getObjectNameForConsumer(ms.getContext(), ms.getConsumer());
} else if (managedObject instanceof ManagedProducer) {
ManagedProducer ms = (ManagedProducer) managedObject;
- objectName = getManagementNamingStrategy().getObjectNameForProducer(ms.getContext(), ms.getProducer());
+ objectName = getManagementObjectNameStrategy().getObjectNameForProducer(ms.getContext(), ms.getProducer());
} else if (managedObject instanceof ManagedBacklogTracer) {
ManagedBacklogTracer mt = (ManagedBacklogTracer) managedObject;
- objectName = getManagementNamingStrategy().getObjectNameForTracer(mt.getContext(), mt.getBacklogTracer());
+ objectName = getManagementObjectNameStrategy().getObjectNameForTracer(mt.getContext(), mt.getBacklogTracer());
} else if (managedObject instanceof ManagedBacklogDebugger) {
ManagedBacklogDebugger md = (ManagedBacklogDebugger) managedObject;
- objectName = getManagementNamingStrategy().getObjectNameForTracer(md.getContext(), md.getBacklogDebugger());
+ objectName = getManagementObjectNameStrategy().getObjectNameForTracer(md.getContext(), md.getBacklogDebugger());
} else if (managedObject instanceof ManagedEventNotifier) {
ManagedEventNotifier men = (ManagedEventNotifier) managedObject;
- objectName = getManagementNamingStrategy().getObjectNameForEventNotifier(men.getContext(), men.getEventNotifier());
+ objectName = getManagementObjectNameStrategy().getObjectNameForEventNotifier(men.getContext(), men.getEventNotifier());
} else if (managedObject instanceof ManagedThreadPool) {
ManagedThreadPool mes = (ManagedThreadPool) managedObject;
- objectName = getManagementNamingStrategy().getObjectNameForThreadPool(mes.getContext(), mes.getThreadPool(), mes.getId(), mes.getSourceId());
+ objectName = getManagementObjectNameStrategy().getObjectNameForThreadPool(mes.getContext(), mes.getThreadPool(), mes.getId(), mes.getSourceId());
} else if (managedObject instanceof ManagedClusterService) {
ManagedClusterService mcs = (ManagedClusterService) managedObject;
- objectName = getManagementNamingStrategy().getObjectNameForClusterService(mcs.getContext(), mcs.getService());
+ objectName = getManagementObjectNameStrategy().getObjectNameForClusterService(mcs.getContext(), mcs.getService());
} else if (managedObject instanceof ManagedService) {
// check for managed service should be last
ManagedService ms = (ManagedService) managedObject;
@@ -142,7 +141,7 @@ public class ManagedManagementStrategy extends DefaultManagementStrategy {
if (ms.getService() instanceof Endpoint) {
return null;
}
- objectName = getManagementNamingStrategy().getObjectNameForService(ms.getContext(), ms.getService());
+ objectName = getManagementObjectNameStrategy().getObjectNameForService(ms.getContext(), ms.getService());
}
return nameType.cast(objectName);
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
index 385693d..d93ed46 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
@@ -574,7 +574,7 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti
if (endpoint != null) {
// ensure endpoint is registered, as the management strategy could have been configured to not always
// register new endpoints in JMX, so we need to check if its registered, and if not register it manually
- ObjectName on = context.getManagementStrategy().getManagementNamingStrategy().getObjectNameForEndpoint(endpoint);
+ ObjectName on = context.getManagementStrategy().getManagementObjectNameStrategy().getObjectNameForEndpoint(endpoint);
if (on != null && !context.getManagementStrategy().getManagementAgent().isRegistered(on)) {
// register endpoint as mbean
Object me = context.getManagementStrategy().getManagementObjectStrategy().getManagedObjectForEndpoint(context, endpoint);
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedNamePatternIncludeHostNameTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedNamePatternIncludeHostNameTest.java
index 5cdc535..14afd0f 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedNamePatternIncludeHostNameTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedNamePatternIncludeHostNameTest.java
@@ -28,7 +28,7 @@ public class ManagedNamePatternIncludeHostNameTest extends ManagementTestSupport
@Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
- DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy)context.getManagementStrategy().getManagementNamingStrategy();
+ DefaultManagementObjectNameStrategy naming = (DefaultManagementObjectNameStrategy)context.getManagementStrategy().getManagementObjectNameStrategy();
naming.setHostName("localhost");
context.getManagementStrategy().getManagementAgent().setIncludeHostName(true);
context.getManagementNameStrategy().setNamePattern("cool-#name#");
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
index e15c459..865f8b9 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
@@ -96,7 +96,7 @@ import org.apache.camel.spi.InflightRepository;
import org.apache.camel.spi.InterceptStrategy;
import org.apache.camel.spi.LifecycleStrategy;
import org.apache.camel.spi.LogListener;
-import org.apache.camel.spi.ManagementNamingStrategy;
+import org.apache.camel.spi.ManagementObjectNameStrategy;
import org.apache.camel.spi.ManagementStrategy;
import org.apache.camel.spi.MessageHistoryFactory;
import org.apache.camel.spi.ModelJAXBContextFactory;
@@ -214,10 +214,10 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
LOG.info("Using custom ManagementStrategy: {}", managementStrategy);
getContext().setManagementStrategy(managementStrategy);
}
- ManagementNamingStrategy managementNamingStrategy = getBeanForType(ManagementNamingStrategy.class);
- if (managementNamingStrategy != null) {
- LOG.info("Using custom ManagementNamingStrategy: {}", managementNamingStrategy);
- getContext().getManagementStrategy().setManagementNamingStrategy(managementNamingStrategy);
+ ManagementObjectNameStrategy managementObjectNameStrategy = getBeanForType(ManagementObjectNameStrategy.class);
+ if (managementObjectNameStrategy != null) {
+ LOG.info("Using custom ManagementObjectNameStrategy: {}", managementObjectNameStrategy);
+ getContext().getManagementStrategy().setManagementObjectNameStrategy(managementObjectNameStrategy);
}
EventFactory eventFactory = getBeanForType(EventFactory.class);
if (eventFactory != null) {
diff --git a/components/camel-jmx/src/main/docs/jmx-component.adoc b/components/camel-jmx/src/main/docs/jmx-component.adoc
index 7a18b5d..ed3b43d 100644
--- a/components/camel-jmx/src/main/docs/jmx-component.adoc
+++ b/components/camel-jmx/src/main/docs/jmx-component.adoc
@@ -134,7 +134,7 @@ Some of these management objects also expose lifecycle operations in
addition to performance counter attributes.
The
-http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/management/DefaultManagementNamingStrategy.html[`DefaultManagementNamingStrategy`]
+http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/management/DefaultManagementObjectNameStrategy.html[`DefaultManagementObjectNameStrategy`]
is the default naming strategy which builds object names used for MBean
registration. By default, `org.apache.camel` is the domain name for all
object names created by `CamelNamingStrategy`. The domain name of the
@@ -800,12 +800,12 @@ types such as:
And in the future we will add additional wrappers for more EIP patterns.
-==== ManagementNamingStrategy
+==== ManagementObjectNameStrategy
*Available as of Camel 2.1*
Camel provides a pluggable API for naming strategy by
-`org.apache.camel.spi.ManagementNamingStrategy`. A default
+`org.apache.camel.spi.ManagementObjectNameStrategy`. A default
implementation is used to compute the MBean names that all MBeans are
registered with.
diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
index 7bc5085..7df790f 100644
--- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
+++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
@@ -52,7 +52,7 @@ import org.apache.camel.spi.InflightRepository;
import org.apache.camel.spi.InterceptStrategy;
import org.apache.camel.spi.LifecycleStrategy;
import org.apache.camel.spi.LogListener;
-import org.apache.camel.spi.ManagementNamingStrategy;
+import org.apache.camel.spi.ManagementObjectNameStrategy;
import org.apache.camel.spi.ManagementStrategy;
import org.apache.camel.spi.Registry;
import org.apache.camel.spi.ReloadStrategy;
@@ -67,8 +67,8 @@ import org.apache.camel.spi.UuidGenerator;
import org.apache.camel.spring.CamelBeanPostProcessor;
import org.apache.camel.spring.SpringCamelContext;
import org.apache.camel.spring.spi.XmlCamelContextConfigurer;
-import org.apache.camel.util.ObjectHelper;
import org.apache.camel.support.jsse.GlobalSSLContextParametersSupplier;
+import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -348,7 +348,7 @@ public class CamelAutoConfiguration {
registerPropertyForBeanType(applicationContext, InflightRepository.class, camelContext::setInflightRepository);
registerPropertyForBeanType(applicationContext, AsyncProcessorAwaitManager.class, camelContext::setAsyncProcessorAwaitManager);
registerPropertyForBeanType(applicationContext, ManagementStrategy.class, camelContext::setManagementStrategy);
- registerPropertyForBeanType(applicationContext, ManagementNamingStrategy.class, managementStrategy::setManagementNamingStrategy);
+ registerPropertyForBeanType(applicationContext, ManagementObjectNameStrategy.class, managementStrategy::setManagementObjectNameStrategy);
registerPropertyForBeanType(applicationContext, EventFactory.class, managementStrategy::setEventFactory);
registerPropertyForBeanType(applicationContext, UnitOfWorkFactory.class, camelContext::setUnitOfWorkFactory);
registerPropertyForBeanType(applicationContext, RuntimeEndpointRegistry.class, camelContext::setRuntimeEndpointRegistry);
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxDumpRouteAsXmlIncludeHostNameTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxDumpRouteAsXmlIncludeHostNameTest.xml
index 22a8d1f..66fefdc 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxDumpRouteAsXmlIncludeHostNameTest.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxDumpRouteAsXmlIncludeHostNameTest.xml
@@ -24,7 +24,7 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <bean id="naming" class="org.apache.camel.management.DefaultManagementNamingStrategy">
+ <bean id="naming" class="org.apache.camel.management.DefaultManagementObjectNameStrategy">
<property name="hostName" value="localhost"/>
<property name="domainName" value="org.apache.camel"/>
</bean>
diff --git a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/management/managedNamePatternFixedIncludeHostNameTest.xml b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/management/managedNamePatternFixedIncludeHostNameTest.xml
index bc62ecf..f086664 100644
--- a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/management/managedNamePatternFixedIncludeHostNameTest.xml
+++ b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/management/managedNamePatternFixedIncludeHostNameTest.xml
@@ -22,7 +22,7 @@
xsi:schemaLocation="
http://www.osgi.org/xmlns/blueprint/v1.0.0 https://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
- <bean id="naming" class="org.apache.camel.management.DefaultManagementNamingStrategy">
+ <bean id="naming" class="org.apache.camel.management.DefaultManagementObjectNameStrategy">
<property name="hostName" value="localhost"/>
<property name="domainName" value="org.apache.camel"/>
</bean>