[bugfix] All JMX Beans should export a name

Author: adamretter

exist-core/src/main/java/org/exist/management/impl/ExistMBean.java

@@ -0,0 +1,40 @@
+/*
+ * eXist-db Open Source Native XML Database
+ * Copyright (C) 2001 The eXist-db Authors
+ *
+ * [email protected]
+ * http://www.exist-db.org
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+package org.exist.management.impl;
+
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
+/**
+ * Interface for all eXist-db provided MBeans.
+ */
+public interface ExistMBean {
+
+    /**
+     * Get the name of the MBean.
+     *
+     * @return the name of the mbean.
+     *
+     * @throws MalformedObjectNameException if the name cannot be constructed.
+     */
+    ObjectName getName() throws MalformedObjectNameException;
+}

exist-core/src/main/java/org/exist/management/impl/JMXAgent.java

@@ -70,7 +70,8 @@ public JMXAgent() {
 
     private void registerSystemMBeans() {
         try {
-            addMBean(new ObjectName(SystemInfo.OBJECT_NAME), new org.exist.management.impl.SystemInfo());
+            final SystemInfoMXBean systemInfoMXBean = new org.exist.management.impl.SystemInfo();
+            addMBean(systemInfoMXBean.getName(), systemInfoMXBean);
         } catch (final MalformedObjectNameException | DatabaseConfigurationException e) {
             LOG.warn("Exception while registering cache mbean.", e);
         }

exist-core/src/main/java/org/exist/management/impl/PerInstanceMBean.java

@@ -22,10 +22,6 @@
 
 package org.exist.management.impl;
 
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
-public interface PerInstanceMBean {
+public interface PerInstanceMBean extends ExistMBean {
     String getInstanceId();
-    ObjectName getName() throws MalformedObjectNameException;
 }

exist-core/src/main/java/org/exist/management/impl/SystemInfo.java

@@ -26,6 +26,9 @@
 
 import org.exist.SystemProperties;
 
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
 /**
  * Class SystemInfo
  * 
@@ -36,6 +39,11 @@ public class SystemInfo implements SystemInfoMXBean {
 
     public static final String OBJECT_NAME = "org.exist.management:type=SystemInfo";
 
+    @Override
+    public ObjectName getName() throws MalformedObjectNameException {
+        return new ObjectName(OBJECT_NAME);
+    }
+
     @Override
     public String getProductName() {
         return SystemProperties.getInstance().getSystemProperty("product-name","eXist");

exist-core/src/main/java/org/exist/management/impl/SystemInfoMXBean.java

@@ -27,7 +27,7 @@
  * @author wessels
  * @author ljo
  */
-public interface SystemInfoMXBean {
+public interface SystemInfoMXBean extends ExistMBean {
     String getProductName();
 
     String getProductVersion();