Repository: incubator-ignite Updated Branches: refs/heads/ignite-125 4916c90c7 -> edd540173
IGNITE-125 Renamed MXBean in logs, comments, javadocs. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/edd54017 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/edd54017 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/edd54017 Branch: refs/heads/ignite-125 Commit: edd5401730946c009aa4c9278a3c6ae75b79c8a1 Parents: 4916c90 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Wed Jan 28 14:37:04 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Wed Jan 28 14:37:04 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/IgniteSystemProperties.java | 2 +- .../org/apache/ignite/cache/CacheManager.java | 6 +- .../client/router/impl/GridTcpRouterImpl.java | 8 +- .../apache/ignite/cluster/ClusterMetrics.java | 2 +- .../org/apache/ignite/cluster/ClusterNode.java | 2 +- .../ClusterLocalNodeMetricsMXBeanImpl.java | 2 +- .../org/apache/ignite/internal/GridGainEx.java | 2 +- .../org/apache/ignite/internal/GridKernal.java | 42 +-- .../internal/mxbean/IgniteStandardMXBean.java | 4 +- .../cache/CacheMetricsMXBeanImpl.java | 2 +- .../processors/cache/GridCacheProcessor.java | 24 +- .../streamer/GridStreamProcessor.java | 22 +- .../apache/ignite/internal/util/GridUtils.java | 30 +- .../mxbean/AdaptiveLoadBalancingSpiMXBean.java | 2 +- .../mxbean/CacheFifoEvictionPolicyMXBean.java | 2 +- .../mxbean/CacheRandomEvictionPolicyMXBean.java | 2 +- .../mxbean/ClusterLocalNodeMetricsMXBean.java | 2 +- .../ignite/mxbean/GridTcpRouterMXBean.java | 2 +- .../org/apache/ignite/mxbean/IgniteMXBean.java | 2 +- .../ignite/mxbean/IgniteMXBeanDescription.java | 2 +- .../IgniteMXBeanParametersDescriptions.java | 2 +- .../mxbean/IgniteMXBeanParametersNames.java | 2 +- .../ignite/mxbean/IgniteThreadPoolMXBean.java | 2 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 12 +- .../testsuites/IgniteUtilSelfTestSuite.java | 2 +- .../util/mbeans/IgniteMXBeanSelfTest.java | 345 ------------------- .../util/mxbeans/IgniteMXBeanSelfTest.java | 345 +++++++++++++++++++ 27 files changed, 436 insertions(+), 436 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edd54017/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java index d35f8f9..e80a4ee 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java @@ -462,7 +462,7 @@ public final class IgniteSystemProperties { * JVM name returned by {@link RuntimeMXBean#getName()}. * <p> * This may be helpful when running GridGain in some application server - * clusters or similar environments to avoid MBean name collisions. + * clusters or similar environments to avoid MXBean name collisions. * <p> * Default is {@code false}. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edd54017/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java index bc9e3f4..49292c4 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java @@ -278,7 +278,7 @@ public class CacheManager implements javax.cache.CacheManager { return new ObjectName(mBeanName); } catch (MalformedObjectNameException e) { - throw new CacheException("Failed to create MBean name: " + mBeanName, e); + throw new CacheException("Failed to create MXBean name: " + mBeanName, e); } } @@ -359,12 +359,12 @@ public class CacheManager implements javax.cache.CacheManager { registeredObjectName); } catch (Exception e) { - throw new CacheException("Failed to register MBean: " + registeredObjectName, e); + throw new CacheException("Failed to register MXBean: " + registeredObjectName, e); } } /** - * @return {@code True} if MBean registered. + * @return {@code True} if MXBean registered. */ private static boolean isRegistered(MBeanServer mBeanServer, ObjectName objectName) { return !mBeanServer.queryNames(objectName, null).isEmpty(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edd54017/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridTcpRouterImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridTcpRouterImpl.java b/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridTcpRouterImpl.java index a4cc73d..59c5813 100644 --- a/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridTcpRouterImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridTcpRouterImpl.java @@ -168,12 +168,12 @@ public class GridTcpRouterImpl implements GridTcpRouter, GridTcpRouterMXBean, Li GridTcpRouterMXBean.class); if (log.isDebugEnabled()) - log.debug("Registered MBean: " + objName); + log.debug("Registered MXBean: " + objName); mbeanName = objName; } catch (JMException e) { - U.error(log, "Failed to register MBean.", e); + U.error(log, "Failed to register MXBean.", e); } } @@ -192,10 +192,10 @@ public class GridTcpRouterImpl implements GridTcpRouter, GridTcpRouterMXBean, Li ManagementFactory.getPlatformMBeanServer().unregisterMBean(mbeanName); if (log.isDebugEnabled()) - log.debug("Unregistered MBean: " + mbeanName); + log.debug("Unregistered MXBean: " + mbeanName); } catch (JMException e) { - U.error(log, "Failed to unregister MBean.", e); + U.error(log, "Failed to unregister MXBean.", e); } if (log.isInfoEnabled()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edd54017/modules/core/src/main/java/org/apache/ignite/cluster/ClusterMetrics.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterMetrics.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterMetrics.java index 7ef463e..267d5cf 100644 --- a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterMetrics.java +++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterMetrics.java @@ -30,7 +30,7 @@ package org.apache.ignite.cluster; * metrics on local node {@link org.apache.ignite.IgniteCluster#localNode() Grid.localNode().getMetrics()} * the metrics are always accurate and up to date. * <p> - * Local node metrics are registered as {@code MBean} and can be accessed from + * Local node metrics are registered as {@code MXBean} and can be accessed from * any JMX management console. The simplest way is to use standard {@code jconsole} * that comes with JDK as it also provides ability to view any node parameter * as a graph. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edd54017/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java index 52f1131..5eb0e18 100644 --- a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java +++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java @@ -101,7 +101,7 @@ import java.util.*; * for execution. For example, you can only pick nodes that don't have any jobs waiting * to be executed. * <p> - * Local node metrics are registered as {@code MBean} and can be accessed from + * Local node metrics are registered as {@code MXBean} and can be accessed from * any JMX management console. The simplest way is to use standard {@code jconsole} * that comes with JDK as it also provides ability to view any node parameter * as a graph. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edd54017/modules/core/src/main/java/org/apache/ignite/internal/ClusterLocalNodeMetricsMXBeanImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/ClusterLocalNodeMetricsMXBeanImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/ClusterLocalNodeMetricsMXBeanImpl.java index 80269e5..87dde4f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/ClusterLocalNodeMetricsMXBeanImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/ClusterLocalNodeMetricsMXBeanImpl.java @@ -22,7 +22,7 @@ import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.mxbean.*; /** - * Local node metrics MBean. + * Local node metrics MXBean. */ public class ClusterLocalNodeMetricsMXBeanImpl implements ClusterLocalNodeMetricsMXBean { /** Grid node. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edd54017/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java b/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java index 3398d99..2a74a0d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java @@ -2236,7 +2236,7 @@ public class GridGainEx { try { IgnitionMXBean mbean = new IgnitionMXBeanAdapter(); - ObjectName objName = U.makeMBeanName( + ObjectName objName = U.makeMXBeanName( null, "Kernal", Ignition.class.getSimpleName() http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edd54017/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java index fd7002c..23dcdad 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java @@ -811,9 +811,9 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMXB ctx.license().ackLicense(); // Register MBeans. - registerKernalMBean(); - registerLocalNodeMBean(); - registerExecutorMBeans(); + registerKernalMXBean(); + registerLocalNodeMXBean(); + registerExecutorMXBeans(); // Lifecycle bean notifications. notifyLifecycleBeans(AFTER_GRID_START); @@ -1427,7 +1427,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMXB } /** @throws IgniteCheckedException If registration failed. */ - private void registerKernalMBean() throws IgniteCheckedException { + private void registerKernalMXBean() throws IgniteCheckedException { try { kernalMBean = U.registerMXBean( cfg.getMBeanServer(), @@ -1448,7 +1448,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMXB } /** @throws IgniteCheckedException If registration failed. */ - private void registerLocalNodeMBean() throws IgniteCheckedException { + private void registerLocalNodeMXBean() throws IgniteCheckedException { ClusterLocalNodeMetricsMXBean mbean = new ClusterLocalNodeMetricsMXBeanImpl(ctx.discovery().localNode()); try { @@ -1461,7 +1461,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMXB ClusterLocalNodeMetricsMXBean.class); if (log.isDebugEnabled()) - log.debug("Registered local node MBean: " + locNodeMBean); + log.debug("Registered local node MXBean: " + locNodeMBean); } catch (JMException e) { locNodeMBean = null; @@ -1471,17 +1471,17 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMXB } /** @throws IgniteCheckedException If registration failed. */ - private void registerExecutorMBeans() throws IgniteCheckedException { - pubExecSvcMBean = registerExecutorMBean(cfg.getExecutorService(), "GridExecutionExecutor"); - sysExecSvcMBean = registerExecutorMBean(cfg.getSystemExecutorService(), "GridSystemExecutor"); - mgmtExecSvcMBean = registerExecutorMBean(cfg.getManagementExecutorService(), "GridManagementExecutor"); - p2PExecSvcMBean = registerExecutorMBean(cfg.getPeerClassLoadingExecutorService(), "GridClassLoadingExecutor"); + private void registerExecutorMXBeans() throws IgniteCheckedException { + pubExecSvcMBean = registerExecutorMXBean(cfg.getExecutorService(), "GridExecutionExecutor"); + sysExecSvcMBean = registerExecutorMXBean(cfg.getSystemExecutorService(), "GridSystemExecutor"); + mgmtExecSvcMBean = registerExecutorMXBean(cfg.getManagementExecutorService(), "GridManagementExecutor"); + p2PExecSvcMBean = registerExecutorMXBean(cfg.getPeerClassLoadingExecutorService(), "GridClassLoadingExecutor"); ClientConnectionConfiguration clientCfg = cfg.getClientConnectionConfiguration(); if (clientCfg != null) { restExecSvcMBean = clientCfg.getRestExecutorService() != null ? - registerExecutorMBean(clientCfg.getRestExecutorService(), "GridRestExecutor") : null; + registerExecutorMXBean(clientCfg.getRestExecutorService(), "GridRestExecutor") : null; } } @@ -1491,7 +1491,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMXB * @return Name for created MBean. * @throws IgniteCheckedException If registration failed. */ - private ObjectName registerExecutorMBean(ExecutorService exec, String name) throws IgniteCheckedException { + private ObjectName registerExecutorMXBean(ExecutorService exec, String name) throws IgniteCheckedException { assert exec != null; try { @@ -1520,7 +1520,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMXB * @param mbean MBean to unregister. * @return {@code True} if successfully unregistered, {@code false} otherwise. */ - private boolean unregisterMBean(@Nullable ObjectName mbean) { + private boolean unregisterMXBean(@Nullable ObjectName mbean) { if (mbean != null) try { cfg.getMBeanServer().unregisterMBean(mbean); @@ -1958,13 +1958,13 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMXB // Unregister MBeans. if (!( - unregisterMBean(pubExecSvcMBean) & - unregisterMBean(sysExecSvcMBean) & - unregisterMBean(mgmtExecSvcMBean) & - unregisterMBean(p2PExecSvcMBean) & - unregisterMBean(kernalMBean) & - unregisterMBean(locNodeMBean) & - unregisterMBean(restExecSvcMBean) + unregisterMXBean(pubExecSvcMBean) & + unregisterMXBean(sysExecSvcMBean) & + unregisterMXBean(mgmtExecSvcMBean) & + unregisterMXBean(p2PExecSvcMBean) & + unregisterMXBean(kernalMBean) & + unregisterMXBean(locNodeMBean) & + unregisterMXBean(restExecSvcMBean) )) errOnStop = false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edd54017/modules/core/src/main/java/org/apache/ignite/internal/mxbean/IgniteStandardMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/mxbean/IgniteStandardMXBean.java b/modules/core/src/main/java/org/apache/ignite/internal/mxbean/IgniteStandardMXBean.java index 59bb9e2..77df345 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/mxbean/IgniteStandardMXBean.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/mxbean/IgniteStandardMXBean.java @@ -50,11 +50,11 @@ public class IgniteStandardMXBean extends StandardMBean { /** * Make a DynamicMBean out of the object implementation, using the specified - * mbeanInterface class. + * mxbeanInterface class. * * @param implementation The implementation of this MBean. * @param mbeanInterface The Management Interface exported by this - * MBean's implementation. If {@code null}, then this + * MXBean's implementation. If {@code null}, then this * object will use standard JMX design pattern to determine * the management interface associated with the given * implementation. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edd54017/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsMXBeanImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsMXBeanImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsMXBeanImpl.java index e9d547c..5eb4708 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsMXBeanImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsMXBeanImpl.java @@ -28,7 +28,7 @@ class CacheMetricsMXBeanImpl implements CacheMetricsMXBean { private GridCacheAdapter<?, ?> cache; /** - * Creates MBean; + * Creates MXBean; * * @param cache Cache. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edd54017/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 838eacc..6ec6c93 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -508,7 +508,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { ctx.resource().injectCacheName(rsrc, cfg.getName()); - registerMbean(rsrc, cfg.getName(), near); + registerMXBean(rsrc, cfg.getName(), near); } } @@ -536,7 +536,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { */ private void cleanup(CacheConfiguration cfg, @Nullable Object rsrc, boolean near) { if (rsrc != null) { - unregisterMbean(rsrc, cfg.getName(), near); + unregisterMXBean(rsrc, cfg.getName(), near); try { ctx.resource().cleanupGeneric(rsrc); @@ -1751,7 +1751,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { } /** - * Registers MBean for cache components. + * Registers MXBean for cache components. * * @param o Cache component. * @param cacheName Cache name. @@ -1759,7 +1759,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { * @throws IgniteCheckedException If registration failed. */ @SuppressWarnings("unchecked") - private void registerMbean(Object o, @Nullable String cacheName, boolean near) + private void registerMXBean(Object o, @Nullable String cacheName, boolean near) throws IgniteCheckedException { assert o != null; @@ -1772,13 +1772,13 @@ public class GridCacheProcessor extends GridProcessorAdapter { cacheName = near ? cacheName + "-near" : cacheName; for (Class<?> itf : o.getClass().getInterfaces()) { - if (itf.getName().endsWith("MBean")) { + if (itf.getName().endsWith("MXBean")) { try { - U.registerCacheMBean(srvr, ctx.gridName(), cacheName, o.getClass().getName(), o, + U.registerCacheMXBean(srvr, ctx.gridName(), cacheName, o.getClass().getName(), o, (Class<Object>)itf); } catch (JMException e) { - throw new IgniteCheckedException("Failed to register MBean for component: " + o, e); + throw new IgniteCheckedException("Failed to register MXBean for component: " + o, e); } break; @@ -1787,13 +1787,13 @@ public class GridCacheProcessor extends GridProcessorAdapter { } /** - * Unregisters MBean for cache components. + * Unregisters MXBean for cache components. * * @param o Cache component. * @param cacheName Cache name. * @param near Near flag. */ - private void unregisterMbean(Object o, @Nullable String cacheName, boolean near) { + private void unregisterMXBean(Object o, @Nullable String cacheName, boolean near) { assert o != null; MBeanServer srvr = ctx.config().getMBeanServer(); @@ -1805,12 +1805,12 @@ public class GridCacheProcessor extends GridProcessorAdapter { cacheName = near ? cacheName + "-near" : cacheName; for (Class<?> itf : o.getClass().getInterfaces()) { - if (itf.getName().endsWith("MBean")) { + if (itf.getName().endsWith("MXBean")) { try { - srvr.unregisterMBean(U.makeCacheMBeanName(ctx.gridName(), cacheName, o.getClass().getName())); + srvr.unregisterMBean(U.makeCacheMXBeanName(ctx.gridName(), cacheName, o.getClass().getName())); } catch (JMException e) { - U.error(log, "Failed to unregister MBean for component: " + o, e); + U.error(log, "Failed to unregister MXBean for component: " + o, e); } break; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edd54017/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamProcessor.java index 53cbd10..ea4d073 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamProcessor.java @@ -77,13 +77,13 @@ public class GridStreamProcessor extends GridProcessorAdapter { new StreamerMXBeanImpl(s), StreamerMXBean.class)); if (log.isDebugEnabled()) - log.debug("Registered MBean for streamer: " + s.name()); + log.debug("Registered MXBean for streamer: " + s.name()); } catch (JMException e) { - U.error(log, "Failed to register streamer MBean: " + s.name(), e); + U.error(log, "Failed to register streamer MXBean: " + s.name(), e); } - // Add mbeans for stages. + // Add mxbeans for stages. for (StreamerStage stage : s.configuration().getStages()) { try { mBeans.add(U.registerMXBean(mBeanSrv, ctx.gridName(), U.maskName(s.name()), "Stage-" + stage.name(), @@ -91,16 +91,16 @@ public class GridStreamProcessor extends GridProcessorAdapter { StreamerStageMXBean.class)); if (log.isDebugEnabled()) - log.debug("Registered MBean for streamer stage [streamer=" + s.name() + + log.debug("Registered MXBean for streamer stage [streamer=" + s.name() + ", stage=" + stage.name() + ']'); } catch (JMException e) { - U.error(log, "Failed to register streamer stage MBean [streamer=" + s.name() + + U.error(log, "Failed to register streamer stage MXBean [streamer=" + s.name() + ", stage=" + stage.name() + ']', e); } } - // Add mbeans for windows. + // Add mxbeans for windows. for (StreamerWindow win : s.configuration().getWindows()) { try { if (hasInterface(win.getClass(), StreamerWindowMXBean.class)) { @@ -110,12 +110,12 @@ public class GridStreamProcessor extends GridProcessorAdapter { StreamerWindowMXBean.class)); if (log.isDebugEnabled()) - log.debug("Registered MBean for streamer window [streamer=" + s.name() + + log.debug("Registered MXBean for streamer window [streamer=" + s.name() + ", window=" + win.name() + ']'); } } catch (JMException e) { - U.error(log, "Failed to register streamer window MBean [streamer=" + s.name() + + U.error(log, "Failed to register streamer window MXBean [streamer=" + s.name() + ", window=" + win.name() + ']', e); } @@ -130,11 +130,11 @@ public class GridStreamProcessor extends GridProcessorAdapter { StreamerIndexProviderMXBean.class)); if (log.isDebugEnabled()) - log.debug("Registered MBean for streamer window index [streamer=" + s.name() + + log.debug("Registered MXBean for streamer window index [streamer=" + s.name() + ", window=" + win.name() + ", index=" + idx.name() + ']'); } catch (JMException e) { - U.error(log, "Failed to register streamer index MBean [streamer=" + s.name() + + U.error(log, "Failed to register streamer index MXBean [streamer=" + s.name() + ", window=" + win.name() + ", index=" + idx.name() + ']', e); } } @@ -276,7 +276,7 @@ public class GridStreamProcessor extends GridProcessorAdapter { mBeanSrv.unregisterMBean(name); } catch (JMException e) { - U.error(log, "Failed to unregister streamer MBean.", e); + U.error(log, "Failed to unregister streamer MXBean.", e); } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edd54017/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java index fa8037a..b30458a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java @@ -3847,11 +3847,11 @@ public abstract class GridUtils { * * @param gridName Grid name. * @param grp Name of the group. - * @param name Name of mbean. + * @param name Name of mxbean. * @return JMX object name. * @throws MalformedObjectNameException Thrown in case of any errors. */ - public static ObjectName makeMBeanName(@Nullable String gridName, @Nullable String grp, String name) + public static ObjectName makeMXBeanName(@Nullable String gridName, @Nullable String grp, String name) throws MalformedObjectNameException { SB sb = new SB(JMX_DOMAIN + ':'); @@ -3896,11 +3896,11 @@ public abstract class GridUtils { * * @param gridName Grid name. * @param cacheName Name of the cache. - * @param name Name of mbean. + * @param name Name of mxbean. * @return JMX object name. * @throws MalformedObjectNameException Thrown in case of any errors. */ - public static ObjectName makeCacheMBeanName(@Nullable String gridName, @Nullable String cacheName, String name) + public static ObjectName makeCacheMXBeanName(@Nullable String gridName, @Nullable String cacheName, String name) throws MalformedObjectNameException { SB sb = new SB(JMX_DOMAIN + ':'); @@ -3926,8 +3926,8 @@ public abstract class GridUtils { * @param gridName Grid name. * @param grp Name of the group. * @param name Name of mxbean. - * @param impl MBean implementation. - * @param itf MBean interface. + * @param impl MXBean implementation. + * @param itf MXBean interface. * @return JMX object name. * @throws JMException If MBean creation failed. */ @@ -3941,17 +3941,17 @@ public abstract class GridUtils { mbean.getMBeanInfo(); - return mbeanSrv.registerMBean(mbean, makeMBeanName(gridName, grp, name)).getObjectName(); + return mbeanSrv.registerMBean(mbean, makeMXBeanName(gridName, grp, name)).getObjectName(); } /** * Registers MBean with the server. * - * @param <T> Type of mbean. + * @param <T> Type of mxbean. * @param mbeanSrv MBean server. - * @param name MBean object name. - * @param impl MBean implementation. - * @param itf MBean interface. + * @param name MXBean object name. + * @param impl MXBean implementation. + * @param itf MXBean interface. * @return JMX object name. * @throws JMException If MBean creation failed. */ @@ -3971,17 +3971,17 @@ public abstract class GridUtils { /** * Registers MBean with the server. * - * @param <T> Type of mbean. + * @param <T> Type of mxbean. * @param mbeanSrv MBean server. * @param gridName Grid name. * @param cacheName Name of the cache. - * @param name Name of mbean. + * @param name Name of mxbean. * @param impl MBean implementation. * @param itf MBean interface. * @return JMX object name. * @throws JMException If MBean creation failed. */ - public static <T> ObjectName registerCacheMBean(MBeanServer mbeanSrv, @Nullable String gridName, + public static <T> ObjectName registerCacheMXBean(MBeanServer mbeanSrv, @Nullable String gridName, @Nullable String cacheName, String name, T impl, Class<T> itf) throws JMException { assert mbeanSrv != null; assert name != null; @@ -3991,7 +3991,7 @@ public abstract class GridUtils { mbean.getMBeanInfo(); - return mbeanSrv.registerMBean(mbean, makeCacheMBeanName(gridName, cacheName, name)).getObjectName(); + return mbeanSrv.registerMBean(mbean, makeCacheMXBeanName(gridName, cacheName, name)).getObjectName(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edd54017/modules/core/src/main/java/org/apache/ignite/mxbean/AdaptiveLoadBalancingSpiMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/AdaptiveLoadBalancingSpiMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/AdaptiveLoadBalancingSpiMXBean.java index 22bfef4..fab2371 100644 --- a/modules/core/src/main/java/org/apache/ignite/mxbean/AdaptiveLoadBalancingSpiMXBean.java +++ b/modules/core/src/main/java/org/apache/ignite/mxbean/AdaptiveLoadBalancingSpiMXBean.java @@ -20,7 +20,7 @@ package org.apache.ignite.mxbean; import org.apache.ignite.spi.loadbalancing.adaptive.*; /** - * Management MBean for {@link AdaptiveLoadBalancingSpi} SPI. + * Management bean for {@link AdaptiveLoadBalancingSpi} SPI. */ @IgniteMXBeanDescription("MXBean that provides access to adaptive load balancing SPI configuration.") public interface AdaptiveLoadBalancingSpiMXBean extends IgniteSpiManagementMXBean { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edd54017/modules/core/src/main/java/org/apache/ignite/mxbean/CacheFifoEvictionPolicyMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/CacheFifoEvictionPolicyMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/CacheFifoEvictionPolicyMXBean.java index 67999e9..6538e85 100644 --- a/modules/core/src/main/java/org/apache/ignite/mxbean/CacheFifoEvictionPolicyMXBean.java +++ b/modules/core/src/main/java/org/apache/ignite/mxbean/CacheFifoEvictionPolicyMXBean.java @@ -18,7 +18,7 @@ package org.apache.ignite.mxbean; /** - * MBean for {@code FIFO} eviction policy. + * MXBean for {@code FIFO} eviction policy. */ @IgniteMXBeanDescription("MXBean for FIFO cache eviction policy.") public interface CacheFifoEvictionPolicyMXBean { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edd54017/modules/core/src/main/java/org/apache/ignite/mxbean/CacheRandomEvictionPolicyMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/CacheRandomEvictionPolicyMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/CacheRandomEvictionPolicyMXBean.java index 4542a3e..cae2f05 100644 --- a/modules/core/src/main/java/org/apache/ignite/mxbean/CacheRandomEvictionPolicyMXBean.java +++ b/modules/core/src/main/java/org/apache/ignite/mxbean/CacheRandomEvictionPolicyMXBean.java @@ -18,7 +18,7 @@ package org.apache.ignite.mxbean; /** - * MBean for {@code random} eviction policy. + * MXBean for {@code random} eviction policy. */ @IgniteMXBeanDescription("MXBean for random cache eviction policy.") public interface CacheRandomEvictionPolicyMXBean { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edd54017/modules/core/src/main/java/org/apache/ignite/mxbean/ClusterLocalNodeMetricsMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/ClusterLocalNodeMetricsMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/ClusterLocalNodeMetricsMXBean.java index b70538d..5a668e6 100644 --- a/modules/core/src/main/java/org/apache/ignite/mxbean/ClusterLocalNodeMetricsMXBean.java +++ b/modules/core/src/main/java/org/apache/ignite/mxbean/ClusterLocalNodeMetricsMXBean.java @@ -20,7 +20,7 @@ package org.apache.ignite.mxbean; import org.apache.ignite.cluster.*; /** - * MBean for local node metrics. + * MXBean for local node metrics. */ @IgniteMXBeanDescription("MXBean that provides access to all local node metrics.") public interface ClusterLocalNodeMetricsMXBean extends ClusterMetrics { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edd54017/modules/core/src/main/java/org/apache/ignite/mxbean/GridTcpRouterMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/GridTcpRouterMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/GridTcpRouterMXBean.java index 2a70862..f420b92 100644 --- a/modules/core/src/main/java/org/apache/ignite/mxbean/GridTcpRouterMXBean.java +++ b/modules/core/src/main/java/org/apache/ignite/mxbean/GridTcpRouterMXBean.java @@ -20,7 +20,7 @@ package org.apache.ignite.mxbean; import java.util.*; /** - * MBean interface for TCP router. + * MXBean interface for TCP router. */ @IgniteMXBeanDescription("MXBean for TCP router.") public interface GridTcpRouterMXBean { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edd54017/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java index 963f195..bfb2b55 100644 --- a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java +++ b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java @@ -122,7 +122,7 @@ public interface IgniteMXBean { * * @return MBean server instance. */ - @IgniteMXBeanDescription("Formatted instance of MBean server instance.") + @IgniteMXBeanDescription("Formatted instance of MXBean server instance.") public String getMBeanServerFormatted(); /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edd54017/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBeanDescription.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBeanDescription.java b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBeanDescription.java index 71fc95b..3992efc 100644 --- a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBeanDescription.java +++ b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBeanDescription.java @@ -20,7 +20,7 @@ package org.apache.ignite.mxbean; import java.lang.annotation.*; /** - * Provides description for MBean classes and methods. + * Provides description for MXBean classes and methods. */ @Documented @Retention(RetentionPolicy.RUNTIME) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edd54017/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBeanParametersDescriptions.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBeanParametersDescriptions.java b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBeanParametersDescriptions.java index cd5a9e2..7124387 100644 --- a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBeanParametersDescriptions.java +++ b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBeanParametersDescriptions.java @@ -20,7 +20,7 @@ package org.apache.ignite.mxbean; import java.lang.annotation.*; /** - * Provides MBean method parameters description. + * Provides MXBean method parameters description. */ @Documented @Retention(RetentionPolicy.RUNTIME) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edd54017/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBeanParametersNames.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBeanParametersNames.java b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBeanParametersNames.java index f4b18ad..5ec9f0d 100644 --- a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBeanParametersNames.java +++ b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBeanParametersNames.java @@ -20,7 +20,7 @@ package org.apache.ignite.mxbean; import java.lang.annotation.*; /** - * Provides MBean method parameters names. + * Provides MXBean method parameters names. */ @Documented @Retention(RetentionPolicy.RUNTIME) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edd54017/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteThreadPoolMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteThreadPoolMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteThreadPoolMXBean.java index dc73aae..b881667 100644 --- a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteThreadPoolMXBean.java +++ b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteThreadPoolMXBean.java @@ -18,7 +18,7 @@ package org.apache.ignite.mxbean; /** - * MBean that provides access to information about executor service. + * MXBean that provides access to information about executor service. */ @IgniteMXBeanDescription("MXBean that provides access to information about executor service.") public interface IgniteThreadPoolMXBean { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edd54017/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java index 5a996fd..69dca2e 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java @@ -257,7 +257,7 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement * @return Uniformly formatted message for SPI start. */ protected final String startInfo() { - return "SPI started ok [startMs=" + getUpTime() + ", spiMBean=" + spiMBean + ']'; + return "SPI started ok [startMs=" + getUpTime() + ", spiMXBean=" + spiMBean + ']'; } /** @@ -309,7 +309,7 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement * * @param gridName Grid name. If null, then name will be empty. * @param impl MBean implementation. - * @param mbeanItf MBean interface (if {@code null}, then standard JMX + * @param mbeanItf MXBean interface (if {@code null}, then standard JMX * naming conventions are used. * @param <T> Type of the MBean * @throws IgniteSpiException If registration failed. @@ -325,10 +325,10 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement spiMBean = U.registerMXBean(jmx, gridName, "SPIs", getName(), impl, mbeanItf); if (log.isDebugEnabled()) - log.debug("Registered SPI MBean: " + spiMBean); + log.debug("Registered SPI MXBean: " + spiMBean); } catch (JMException e) { - throw new IgniteSpiException("Failed to register SPI MBean: " + spiMBean, e); + throw new IgniteSpiException("Failed to register SPI MXBean: " + spiMBean, e); } } @@ -348,10 +348,10 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement jmx.unregisterMBean(spiMBean); if (log.isDebugEnabled()) - log.debug("Unregistered SPI MBean: " + spiMBean); + log.debug("Unregistered SPI MXBean: " + spiMBean); } catch (JMException e) { - throw new IgniteSpiException("Failed to unregister SPI MBean: " + spiMBean, e); + throw new IgniteSpiException("Failed to unregister SPI MXBean: " + spiMBean, e); } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edd54017/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java index e0876bc..60cd015 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java @@ -21,7 +21,7 @@ import junit.framework.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.util.*; -import org.apache.ignite.util.mbeans.*; +import org.apache.ignite.util.mxbeans.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.discovery.*; import org.apache.ignite.thread.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edd54017/modules/core/src/test/java/org/apache/ignite/util/mbeans/IgniteMXBeanSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/util/mbeans/IgniteMXBeanSelfTest.java b/modules/core/src/test/java/org/apache/ignite/util/mbeans/IgniteMXBeanSelfTest.java deleted file mode 100644 index af94998..0000000 --- a/modules/core/src/test/java/org/apache/ignite/util/mbeans/IgniteMXBeanSelfTest.java +++ /dev/null @@ -1,345 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.util.mbeans; - -import org.apache.ignite.internal.mxbean.*; -import org.apache.ignite.mxbean.*; -import org.apache.ignite.testframework.junits.common.*; -import javax.management.*; - -/** - * MXBean test. - */ -public class IgniteMXBeanSelfTest extends GridCommonAbstractTest { - /** - * Tests correct MBean interface. - * - * @throws Exception Thrown if test fails. - */ - public void testCorrectMBeanInfo() throws Exception { - StandardMBean mbean = new IgniteStandardMXBean(new IgniteMXBeanImplementation(), IgniteMXBeanInterface.class); - - MBeanInfo info = mbean.getMBeanInfo(); - - assert info.getDescription().equals("MXBeanDescription.") == true; - - assert info.getOperations().length == 2; - - for (MBeanOperationInfo opInfo: info.getOperations()) { - if (opInfo.getDescription().equals("MXBeanOperation.")) - assert opInfo.getSignature().length == 2; - else { - assert opInfo.getDescription().equals("MXBeanSuperOperation.") == true; - assert opInfo.getSignature().length == 1; - } - } - - for (MBeanParameterInfo paramInfo: info.getOperations()[0].getSignature()) { - if (paramInfo.getName().equals("ignored")) - assert paramInfo.getDescription().equals("MXBeanOperationParameter1.") == true; - else { - assert paramInfo.getName().equals("someData") == true; - assert paramInfo.getDescription().equals("MXBeanOperationParameter2.") == true; - } - } - - assert info.getAttributes().length == 4: "Expected 4 attributes but got " + info.getAttributes().length; - - for (MBeanAttributeInfo attrInfo: info.getAttributes()) { - if (attrInfo.isWritable() == false) { - assert (attrInfo.getDescription().equals("MXBeanReadonlyGetter.") == true || - attrInfo.getDescription().equals("MXBeanROGetter.")); - } - else { - assert (attrInfo.getDescription().equals("MXBeanWritableGetter.") == true || - attrInfo.getDescription().equals("MXBeanWritableIsGetter.")); - } - } - } - - /** - * Tests correct MBean interface. - * @throws Exception Thrown if test fails. - */ - public void testMissedNameMBeanInfo() throws Exception { - try { - StandardMBean mbean = new IgniteStandardMXBean(new IgniteMXBeanImplementation(), IgniteMXBeanInterfaceBad.class); - - mbean.getMBeanInfo(); - } - catch (AssertionError e) { - return; - } - - assert false; - } - - /** - * Tests correct MBean interface. - * @throws Exception Thrown if test fails. - */ - public void testMissedDescriptionMBeanInfo() throws Exception { - try { - StandardMBean mbean = new IgniteStandardMXBean(new IgniteMXBeanImplementation(), - IgniteMXBeanInterfaceBadAgain.class); - - mbean.getMBeanInfo(); - } - catch (AssertionError e) { - return; - } - - assert false; - } - - /** - * Tests correct MBean interface. - * @throws Exception Thrown if test fails. - */ - public void testEmptyDescriptionMBeanInfo() throws Exception { - try { - StandardMBean mbean = new IgniteStandardMXBean(new IgniteMXBeanImplementation(), - IgniteMXBeanInterfaceEmptyDescription.class); - - mbean.getMBeanInfo(); - } - catch (AssertionError e) { - return; - } - - assert false; - } - - /** - * Tests correct MBean interface. - * @throws Exception Thrown if test fails. - */ - public void testEmptyNameMBeanInfo() throws Exception { - try { - StandardMBean mbean = new IgniteStandardMXBean(new IgniteMXBeanImplementation(), - IgniteMXBeanInterfaceEmptyName.class); - - mbean.getMBeanInfo(); - } - catch (AssertionError e) { - return; - } - - assert false; - } - - /** - * Super interface for {@link IgniteMXBeanInterface}. - */ - public static interface IgniteMXBeanSuperInterface { - /** - * Test getter. - * - * @return Some string. - */ - @IgniteMXBeanDescription("MXBeanROGetter.") - public String getROData(); - - /** - * Test MBean operation. - * - * @param someData Some data. - * @return Some string. - */ - @IgniteMXBeanDescription("MXBeanSuperOperation.") - @IgniteMXBeanParametersNames({"someData"}) - @IgniteMXBeanParametersDescriptions({"MXBeanOperationParameter1."}) - public String doSomethingSuper(String someData); - } - - /** - * Test MBean interface. - */ - @IgniteMXBeanDescription("MXBeanDescription.") - public static interface IgniteMXBeanInterface extends IgniteMXBeanSuperInterface { - /** - * Test getter. - * - * @return Some string. - */ - @IgniteMXBeanDescription("MXBeanWritableGetter.") - public String getWritableData(); - - /** - * Test setter. - * - * @param data Some string. - */ - public void setWritableData(String data); - - /** - * Test getter. - * - * @return Some string. - */ - @IgniteMXBeanDescription("MXBeanReadonlyGetter.") - public String getReadOnlyData(); - - /** - * Test boolean getter. - * - * @return Some string. - */ - @IgniteMXBeanDescription("MXBeanWritableIsGetter.") - public boolean isWritable(); - - /** - * Test boolean setter. - * @param isWritable Just a boolean. - */ - public void setWritable(boolean isWritable); - - /** - * Test MBean operation. - * - * @param ignored Some value. - * @param someData Some data. - * @return Some string. - */ - @IgniteMXBeanDescription("MXBeanOperation.") - @IgniteMXBeanParametersNames({"ignored", "someData"}) - @IgniteMXBeanParametersDescriptions({"MXBeanOperationParameter1.", "MXBeanOperationParameter2."}) - public String doSomething(boolean ignored, String someData); - } - - /** - * Test MXBean interface. - */ - public static interface IgniteMXBeanInterfaceBad { - /** - * Test MBean operation. - * - * @param ignored Some value. - * @param someData Some data. - * @return Some string. - */ - @IgniteMXBeanDescription("MXBeanOperation.") - @IgniteMXBeanParametersNames({"ignored"}) - @IgniteMXBeanParametersDescriptions({"MXBeanOperationParameter1.", "MXBeanOperationParameter2."}) - public String doSomethingBad(boolean ignored, String someData); - } - - /** - * Test MXBean interface. - */ - public static interface IgniteMXBeanInterfaceEmptyDescription { - /** - * Test MBean operation. - * - * @param ignored Some value. - * @param someData Some data. - * @return Some string. - */ - @IgniteMXBeanDescription("") - public String doSomethingBad(boolean ignored, String someData); - } - - /** - * Test MXBean interface. - */ - public static interface IgniteMXBeanInterfaceEmptyName { - /** - * Test MBean operation. - * - * @param ignored Some value. - * @param someData Some data. - * @return Some string. - */ - @IgniteMXBeanParametersNames({"", "someData"}) - public String doSomethingBadAgain(boolean ignored, String someData); - } - - /** - * Test MXBean interface. - */ - public static interface IgniteMXBeanInterfaceBadAgain { - /** - * Test MBean operation. - * - * @param ignored Some value. - * @param someData Some data. - * @return Some string. - */ - @IgniteMXBeanDescription("MXBeanOperation.") - @IgniteMXBeanParametersNames({"ignored", "someData"}) - @IgniteMXBeanParametersDescriptions({"MXBeanOperationParameter1."}) - public String doSomethingBadAgain(boolean ignored, String someData); - } - - /** - * Test MBean implementation. - */ - public class IgniteMXBeanImplementation implements IgniteMXBeanInterface, IgniteMXBeanInterfaceBad, - IgniteMXBeanInterfaceBadAgain, IgniteMXBeanInterfaceEmptyDescription, IgniteMXBeanInterfaceEmptyName { - - /** {@inheritDoc} */ - @Override public String doSomething(boolean ignored, String someData) { - return null; - } - - /** {@inheritDoc} */ - @Override public String getReadOnlyData() { - return null; - } - - /** {@inheritDoc} */ - @Override public String getWritableData() { - return null; - } - - /** {@inheritDoc} */ - @Override public void setWritableData(String data) { - // No-op. - } - - /** {@inheritDoc} */ - @Override public String doSomethingBad(boolean ignored, String someData) { - return null; - } - - /** {@inheritDoc} */ - @Override public String doSomethingBadAgain(boolean ignored, String someData) { - return null; - } - - /** {@inheritDoc} */ - @Override public boolean isWritable() { - return false; - } - - /** {@inheritDoc} */ - @Override public void setWritable(boolean isWritable) { - // No-op. - } - - /** {@inheritDoc} */ - @Override public String getROData() { - return null; - } - - /** {@inheritDoc} */ - @Override public String doSomethingSuper(String someData) { - return null; - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edd54017/modules/core/src/test/java/org/apache/ignite/util/mxbeans/IgniteMXBeanSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/util/mxbeans/IgniteMXBeanSelfTest.java b/modules/core/src/test/java/org/apache/ignite/util/mxbeans/IgniteMXBeanSelfTest.java new file mode 100644 index 0000000..f4d1d89 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/util/mxbeans/IgniteMXBeanSelfTest.java @@ -0,0 +1,345 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.util.mxbeans; + +import org.apache.ignite.internal.mxbean.*; +import org.apache.ignite.mxbean.*; +import org.apache.ignite.testframework.junits.common.*; +import javax.management.*; + +/** + * MXBean test. + */ +public class IgniteMXBeanSelfTest extends GridCommonAbstractTest { + /** + * Tests correct MBean interface. + * + * @throws Exception Thrown if test fails. + */ + public void testCorrectMBeanInfo() throws Exception { + StandardMBean mbean = new IgniteStandardMXBean(new IgniteMXBeanImplementation(), IgniteMXBeanInterface.class); + + MBeanInfo info = mbean.getMBeanInfo(); + + assert info.getDescription().equals("MXBeanDescription.") == true; + + assert info.getOperations().length == 2; + + for (MBeanOperationInfo opInfo: info.getOperations()) { + if (opInfo.getDescription().equals("MXBeanOperation.")) + assert opInfo.getSignature().length == 2; + else { + assert opInfo.getDescription().equals("MXBeanSuperOperation.") == true; + assert opInfo.getSignature().length == 1; + } + } + + for (MBeanParameterInfo paramInfo: info.getOperations()[0].getSignature()) { + if (paramInfo.getName().equals("ignored")) + assert paramInfo.getDescription().equals("MXBeanOperationParameter1.") == true; + else { + assert paramInfo.getName().equals("someData") == true; + assert paramInfo.getDescription().equals("MXBeanOperationParameter2.") == true; + } + } + + assert info.getAttributes().length == 4: "Expected 4 attributes but got " + info.getAttributes().length; + + for (MBeanAttributeInfo attrInfo: info.getAttributes()) { + if (attrInfo.isWritable() == false) { + assert (attrInfo.getDescription().equals("MXBeanReadonlyGetter.") == true || + attrInfo.getDescription().equals("MXBeanROGetter.")); + } + else { + assert (attrInfo.getDescription().equals("MXBeanWritableGetter.") == true || + attrInfo.getDescription().equals("MXBeanWritableIsGetter.")); + } + } + } + + /** + * Tests correct MBean interface. + * @throws Exception Thrown if test fails. + */ + public void testMissedNameMBeanInfo() throws Exception { + try { + StandardMBean mbean = new IgniteStandardMXBean(new IgniteMXBeanImplementation(), IgniteMXBeanInterfaceBad.class); + + mbean.getMBeanInfo(); + } + catch (AssertionError e) { + return; + } + + assert false; + } + + /** + * Tests correct MBean interface. + * @throws Exception Thrown if test fails. + */ + public void testMissedDescriptionMBeanInfo() throws Exception { + try { + StandardMBean mbean = new IgniteStandardMXBean(new IgniteMXBeanImplementation(), + IgniteMXBeanInterfaceBadAgain.class); + + mbean.getMBeanInfo(); + } + catch (AssertionError e) { + return; + } + + assert false; + } + + /** + * Tests correct MBean interface. + * @throws Exception Thrown if test fails. + */ + public void testEmptyDescriptionMBeanInfo() throws Exception { + try { + StandardMBean mbean = new IgniteStandardMXBean(new IgniteMXBeanImplementation(), + IgniteMXBeanInterfaceEmptyDescription.class); + + mbean.getMBeanInfo(); + } + catch (AssertionError e) { + return; + } + + assert false; + } + + /** + * Tests correct MBean interface. + * @throws Exception Thrown if test fails. + */ + public void testEmptyNameMBeanInfo() throws Exception { + try { + StandardMBean mbean = new IgniteStandardMXBean(new IgniteMXBeanImplementation(), + IgniteMXBeanInterfaceEmptyName.class); + + mbean.getMBeanInfo(); + } + catch (AssertionError e) { + return; + } + + assert false; + } + + /** + * Super interface for {@link IgniteMXBeanInterface}. + */ + public static interface IgniteMXBeanSuperInterface { + /** + * Test getter. + * + * @return Some string. + */ + @IgniteMXBeanDescription("MXBeanROGetter.") + public String getROData(); + + /** + * Test MBean operation. + * + * @param someData Some data. + * @return Some string. + */ + @IgniteMXBeanDescription("MXBeanSuperOperation.") + @IgniteMXBeanParametersNames({"someData"}) + @IgniteMXBeanParametersDescriptions({"MXBeanOperationParameter1."}) + public String doSomethingSuper(String someData); + } + + /** + * Test MBean interface. + */ + @IgniteMXBeanDescription("MXBeanDescription.") + public static interface IgniteMXBeanInterface extends IgniteMXBeanSuperInterface { + /** + * Test getter. + * + * @return Some string. + */ + @IgniteMXBeanDescription("MXBeanWritableGetter.") + public String getWritableData(); + + /** + * Test setter. + * + * @param data Some string. + */ + public void setWritableData(String data); + + /** + * Test getter. + * + * @return Some string. + */ + @IgniteMXBeanDescription("MXBeanReadonlyGetter.") + public String getReadOnlyData(); + + /** + * Test boolean getter. + * + * @return Some string. + */ + @IgniteMXBeanDescription("MXBeanWritableIsGetter.") + public boolean isWritable(); + + /** + * Test boolean setter. + * @param isWritable Just a boolean. + */ + public void setWritable(boolean isWritable); + + /** + * Test MBean operation. + * + * @param ignored Some value. + * @param someData Some data. + * @return Some string. + */ + @IgniteMXBeanDescription("MXBeanOperation.") + @IgniteMXBeanParametersNames({"ignored", "someData"}) + @IgniteMXBeanParametersDescriptions({"MXBeanOperationParameter1.", "MXBeanOperationParameter2."}) + public String doSomething(boolean ignored, String someData); + } + + /** + * Test MXBean interface. + */ + public static interface IgniteMXBeanInterfaceBad { + /** + * Test MBean operation. + * + * @param ignored Some value. + * @param someData Some data. + * @return Some string. + */ + @IgniteMXBeanDescription("MXBeanOperation.") + @IgniteMXBeanParametersNames({"ignored"}) + @IgniteMXBeanParametersDescriptions({"MXBeanOperationParameter1.", "MXBeanOperationParameter2."}) + public String doSomethingBad(boolean ignored, String someData); + } + + /** + * Test MXBean interface. + */ + public static interface IgniteMXBeanInterfaceEmptyDescription { + /** + * Test MBean operation. + * + * @param ignored Some value. + * @param someData Some data. + * @return Some string. + */ + @IgniteMXBeanDescription("") + public String doSomethingBad(boolean ignored, String someData); + } + + /** + * Test MXBean interface. + */ + public static interface IgniteMXBeanInterfaceEmptyName { + /** + * Test MBean operation. + * + * @param ignored Some value. + * @param someData Some data. + * @return Some string. + */ + @IgniteMXBeanParametersNames({"", "someData"}) + public String doSomethingBadAgain(boolean ignored, String someData); + } + + /** + * Test MXBean interface. + */ + public static interface IgniteMXBeanInterfaceBadAgain { + /** + * Test MBean operation. + * + * @param ignored Some value. + * @param someData Some data. + * @return Some string. + */ + @IgniteMXBeanDescription("MXBeanOperation.") + @IgniteMXBeanParametersNames({"ignored", "someData"}) + @IgniteMXBeanParametersDescriptions({"MXBeanOperationParameter1."}) + public String doSomethingBadAgain(boolean ignored, String someData); + } + + /** + * Test MBean implementation. + */ + public class IgniteMXBeanImplementation implements IgniteMXBeanInterface, IgniteMXBeanInterfaceBad, + IgniteMXBeanInterfaceBadAgain, IgniteMXBeanInterfaceEmptyDescription, IgniteMXBeanInterfaceEmptyName { + + /** {@inheritDoc} */ + @Override public String doSomething(boolean ignored, String someData) { + return null; + } + + /** {@inheritDoc} */ + @Override public String getReadOnlyData() { + return null; + } + + /** {@inheritDoc} */ + @Override public String getWritableData() { + return null; + } + + /** {@inheritDoc} */ + @Override public void setWritableData(String data) { + // No-op. + } + + /** {@inheritDoc} */ + @Override public String doSomethingBad(boolean ignored, String someData) { + return null; + } + + /** {@inheritDoc} */ + @Override public String doSomethingBadAgain(boolean ignored, String someData) { + return null; + } + + /** {@inheritDoc} */ + @Override public boolean isWritable() { + return false; + } + + /** {@inheritDoc} */ + @Override public void setWritable(boolean isWritable) { + // No-op. + } + + /** {@inheritDoc} */ + @Override public String getROData() { + return null; + } + + /** {@inheritDoc} */ + @Override public String doSomethingSuper(String someData) { + return null; + } + } +}
