From d6dbbebc88967aafa154998fc3b4b72c8e51c8d2 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 18 Dec 2013 22:39:37 -0800 Subject: [PATCH] Polish --- .../boot/actuate/endpoint/jmx/EndpointMBean.java | 9 ++++++--- .../actuate/endpoint/jmx/EndpointMBeanExporter.java | 12 ++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBean.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBean.java index 47866be9751..b355ac2c19a 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBean.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBean.java @@ -59,12 +59,15 @@ public class EndpointMBean { if (result == null) { return null; } - else if (result instanceof String) { + + if (result instanceof String) { return result; } - else if (result.getClass().isArray() || result instanceof List) { + + if (result.getClass().isArray() || result instanceof List) { return this.mapper.convertValue(result, List.class); } + return this.mapper.convertValue(result, Map.class); } -} \ No newline at end of file +} diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporter.java index 43314504415..f049e02421d 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporter.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporter.java @@ -77,7 +77,7 @@ public class EndpointMBeanExporter implements SmartLifecycle, ApplicationContext } public void setDomainName(String domainName) { - Assert.notNull(domainName, "DomainName should not be null"); + Assert.notNull(domainName, "DomainName must not be null"); this.domainName = domainName; } @@ -96,7 +96,7 @@ public class EndpointMBeanExporter implements SmartLifecycle, ApplicationContext @SuppressWarnings({ "rawtypes" }) protected void locateAndRegisterEndpoints(MBeanExporter mbeanExporter) { - Assert.notNull(mbeanExporter, "MBeanExporter should not be null"); + Assert.notNull(mbeanExporter, "MBeanExporter must not be null"); Map endpoints = this.applicationContext .getBeansOfType(Endpoint.class); for (Map.Entry endpointEntry : endpoints.entrySet()) { @@ -114,11 +114,11 @@ public class EndpointMBeanExporter implements SmartLifecycle, ApplicationContext mbeanExporter.registerManagedResource(new EndpointMBean(endpoint), getObjectName(beanKey, endpoint)); } - catch (MBeanExportException e) { - logger.error("Could not register MBean for endpoint [" + beanKey + "]", e); + catch (MBeanExportException ex) { + logger.error("Could not register MBean for endpoint [" + beanKey + "]", ex); } - catch (MalformedObjectNameException e) { - logger.error("Could not register MBean for endpoint [" + beanKey + "]", e); + catch (MalformedObjectNameException ex) { + logger.error("Could not register MBean for endpoint [" + beanKey + "]", ex); } }