Repository: camel Updated Branches: refs/heads/master 2c826fe40 -> c0fdc2f35
CAMEL-11790: Add headers map factory to the Camel commands and as JMX attribute so its easier to see which one is in use. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c0fdc2f3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c0fdc2f3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c0fdc2f3 Branch: refs/heads/master Commit: c0fdc2f35ecf3aa7772bbda802b8f0e90f882bd8 Parents: 2c826fe Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Sep 27 09:55:11 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Sep 27 09:55:11 2017 +0200 ---------------------------------------------------------------------- .../camel/api/management/mbean/ManagedCamelContextMBean.java | 3 +++ .../apache/camel/management/mbean/ManagedCamelContext.java | 7 ++++++- .../apache/camel/commands/AbstractLocalCamelController.java | 1 + .../java/org/apache/camel/commands/ContextInfoCommand.java | 1 + .../camel/commands/jolokia/DefaultJolokiaCamelController.java | 1 + 5 files changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/c0fdc2f3/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java index 7cf41f6..70d04fb 100644 --- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java +++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java @@ -65,6 +65,9 @@ public interface ManagedCamelContextMBean extends ManagedPerformanceCounterMBean @ManagedAttribute(description = "ApplicationContext class name") String getApplicationContextClassName(); + @ManagedAttribute(description = "HeadersMapFactory class name") + String getHeadersMapFactoryClassName(); + @Deprecated @ManagedOperation(description = "Gets the value of a Camel global option") String getProperty(String key) throws Exception; http://git-wip-us.apache.org/repos/asf/camel/blob/c0fdc2f3/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java ---------------------------------------------------------------------- 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 1af5bb1..60b1029 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 @@ -137,12 +137,17 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti public String getApplicationContextClassName() { if (context.getApplicationContextClassLoader() != null) { - return context.getApplicationContextClassLoader().toString(); + return context.getApplicationContextClassLoader().getClass().getName(); } else { return null; } } + @Override + public String getHeadersMapFactoryClassName() { + return context.getHeadersMapFactory().getClass().getName(); + } + @Deprecated public Map<String, String> getProperties() { return getGlobalOptions(); http://git-wip-us.apache.org/repos/asf/camel/blob/c0fdc2f3/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java ---------------------------------------------------------------------- diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java index 554471d..4d0a004 100644 --- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java +++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java @@ -88,6 +88,7 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll answer.put("classResolver", context.getClassResolver().toString()); answer.put("packageScanClassResolver", context.getPackageScanClassResolver().toString()); answer.put("applicationContextClassLoader", context.getApplicationContextClassLoader().toString()); + answer.put("headersMapFactory", context.getHeadersMapFactory().toString()); for (Map.Entry<String, String> entry : context.getProperties().entrySet()) { answer.put("property." + entry.getKey(), entry.getValue()); http://git-wip-us.apache.org/repos/asf/camel/blob/c0fdc2f3/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInfoCommand.java ---------------------------------------------------------------------- diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInfoCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInfoCommand.java index cdd6253..419bad8 100644 --- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInfoCommand.java +++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInfoCommand.java @@ -97,6 +97,7 @@ public class ContextInfoCommand extends AbstractContextCommand { out.println(stringEscape.unescapeJava("\tClassResolver: " + row.get("classResolver"))); out.println(stringEscape.unescapeJava("\tPackageScanClassResolver: " + row.get("packageScanClassResolver"))); out.println(stringEscape.unescapeJava("\tApplicationContextClassLoader: " + row.get("applicationContextClassLoader"))); + out.println(stringEscape.unescapeJava("\tHeadersMapFactory: " + row.get("headersMapFactory"))); printStatistics(camelController, out); http://git-wip-us.apache.org/repos/asf/camel/blob/c0fdc2f3/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java ---------------------------------------------------------------------- diff --git a/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java b/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java index cf30c39..867a052 100644 --- a/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java +++ b/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java @@ -181,6 +181,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple long timeout = (Long) answer.get("timeout"); answer.put("shutdownTimeout", "" + unit.toSeconds(timeout)); answer.put("applicationContextClassLoader", answer.get("applicationContextClassName")); + answer.put("HeadersMapFactory", answer.get("headersMapFactoryClassName")); } return answer;
