GEODE-288: apply spotless to files changed by moving admin pkg to internal
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a672c7d3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a672c7d3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a672c7d3 Branch: refs/heads/feature/GEODE-288 Commit: a672c7d3e61d27ac9615abbb5f9099ece48fb3ef Parents: 895fd14 Author: Kirk Lund <[email protected]> Authored: Wed Oct 26 15:46:57 2016 -0700 Committer: Kirk Lund <[email protected]> Committed: Wed Oct 26 15:46:57 2016 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/geode/cache/Cache.java | 14 +- .../geode/distributed/DistributedSystem.java | 53 +++--- .../internal/InternalDistributedSystem.java | 1 + .../apache/geode/internal/admin/GemFireVM.java | 12 +- .../admin/api/AdminDistributedSystem.java | 10 +- .../api/AdminDistributedSystemFactory.java | 5 +- .../internal/admin/api/AdminException.java | 2 +- .../geode/internal/admin/api/AlertLevel.java | 3 +- .../admin/api/CacheDoesNotExistException.java | 2 +- .../admin/api/DistributedSystemConfig.java | 8 +- .../admin/api/DistributionLocatorConfig.java | 1 + .../admin/api/RuntimeAdminException.java | 2 +- .../internal/admin/api/StatisticResource.java | 5 +- .../geode/internal/admin/api/SystemMember.java | 42 +++-- .../api/UnmodifiableConfigurationException.java | 2 +- .../api/impl/AdminDistributedSystemImpl.java | 25 ++- .../admin/api/impl/CacheServerImpl.java | 5 +- .../api/impl/ConfigurationParameterImpl.java | 5 +- .../impl/ConfigurationParameterListener.java | 6 +- .../admin/api/impl/ManagedEntityConfigXml.java | 7 +- .../impl/ManagedEntityConfigXmlGenerator.java | 11 +- .../impl/ManagedEntityControllerFactory.java | 10 +- .../internal/admin/api/impl/StatisticImpl.java | 3 +- .../admin/api/impl/StatisticResourceImpl.java | 15 +- .../admin/api/impl/SystemMemberCacheImpl.java | 8 +- .../admin/api/impl/SystemMemberImpl.java | 35 ++-- .../admin/api/impl/SystemMemberRegionImpl.java | 4 +- .../internal/admin/api/jmx/AgentConfig.java | 2 +- .../jmx/impl/AdminDistributedSystemJmxImpl.java | 17 +- .../admin/api/jmx/impl/AgentConfigImpl.java | 47 ++--- .../internal/admin/api/jmx/impl/AgentImpl.java | 12 +- .../admin/api/jmx/impl/CacheServerJmxImpl.java | 17 +- .../admin/api/jmx/impl/ConfigAttributeInfo.java | 9 +- .../jmx/impl/ConfigurationParameterJmxImpl.java | 5 +- .../DistributedSystemHealthConfigJmxImpl.java | 5 +- .../jmx/impl/DistributionLocatorJmxImpl.java | 6 +- .../admin/api/jmx/impl/GenerateMBeanHTML.java | 3 +- .../internal/admin/api/jmx/impl/MBeanUtil.java | 14 +- .../admin/api/jmx/impl/ManagedResourceType.java | 25 ++- .../api/jmx/impl/MemberInfoWithStatsMBean.java | 10 +- .../api/jmx/impl/StatisticAttributeInfo.java | 9 +- .../api/jmx/impl/StatisticResourceJmxImpl.java | 35 ++-- .../impl/SystemMemberBridgeServerJmxImpl.java | 3 +- .../api/jmx/impl/SystemMemberCacheJmxImpl.java | 26 +-- .../admin/api/jmx/impl/SystemMemberJmxImpl.java | 23 +-- .../api/jmx/impl/SystemMemberRegionJmxImpl.java | 17 +- .../admin/remote/AddHealthListenerResponse.java | 6 +- .../internal/admin/remote/AdminRegion.java | 2 +- .../remote/FetchHealthDiagnosisResponse.java | 4 +- .../admin/remote/HealthListenerMessage.java | 4 +- .../remote/RefreshMemberSnapshotRequest.java | 4 +- .../remote/RefreshMemberSnapshotResponse.java | 4 +- .../internal/admin/remote/RemoteGemFireVM.java | 10 +- .../query/dunit/QueryUsingPoolDUnitTest.java | 49 ++++-- .../cache/query/dunit/RemoteQueryDUnitTest.java | 176 +++++++------------ .../admin/api/impl/HealthEvaluatorTestCase.java | 4 +- 56 files changed, 357 insertions(+), 487 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/cache/Cache.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/Cache.java b/geode-core/src/main/java/org/apache/geode/cache/Cache.java index 63e916d..2c37ace 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/Cache.java +++ b/geode-core/src/main/java/org/apache/geode/cache/Cache.java @@ -274,14 +274,12 @@ public interface Cache extends GemFireCache { * @since GemFire 7.0 */ public GatewayConflictResolver getGatewayConflictResolver(); - - /** - * Sets whether or not this <code>Cache</code> resides in a - * long-running "cache server" VM. A cache server may be an - * application VM or may be a stand-along VM launched using {@linkplain - * AdminDistributedSystem#addCacheServer - * administration API} or the <code>cacheserver</code> command line - * utility. + + /** + * Sets whether or not this <code>Cache</code> resides in a long-running "cache server" VM. A + * cache server may be an application VM or may be a stand-along VM launched using + * {@linkplain AdminDistributedSystem#addCacheServer administration API} or the + * <code>cacheserver</code> command line utility. * * @since GemFire 4.0 */ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/distributed/DistributedSystem.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/DistributedSystem.java b/geode-core/src/main/java/org/apache/geode/distributed/DistributedSystem.java index 5aa405f..41f17ae 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/DistributedSystem.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/DistributedSystem.java @@ -44,15 +44,11 @@ import java.util.concurrent.TimeUnit; import static org.apache.geode.distributed.ConfigurationProperties.*; /** - * A "connection" to a GemFire distributed system. A - * <code>DistributedSystem</code> is created by invoking the {@link - * #connect} method with a configuration as described <a - * href="#configuration">below</a>. A <code>DistributedSystem</code> - * is used when calling {@link - * org.apache.geode.cache.CacheFactory#create}. This class should - * not be confused with the {@link - * AdminDistributedSystem - * AdminDistributedSystem} interface that is used for administering a + * A "connection" to a GemFire distributed system. A <code>DistributedSystem</code> is created by + * invoking the {@link #connect} method with a configuration as described + * <a href="#configuration">below</a>. A <code>DistributedSystem</code> is used when calling + * {@link org.apache.geode.cache.CacheFactory#create}. This class should not be confused with the + * {@link AdminDistributedSystem AdminDistributedSystem} interface that is used for administering a * distributed system. * * <P> @@ -135,25 +131,18 @@ public abstract class DistributedSystem implements StatisticsFactory { * @param config The <a href="#configuration">configuration properties</a> used when connecting to * the distributed system * - * @throws IllegalArgumentException - * If <code>config</code> contains an unknown configuration - * property or a configuration property does not have an - * allowed value. Note that the values of boolean - * properties are parsed using {@link Boolean#valueOf(java.lang.String)}. - * Therefore all values other than "true" values will be - * considered <code>false</code> -- an exception will not be - * thrown. - * @throws IllegalStateException - * If a <code>DistributedSystem</code> with a different - * configuration has already been created in this VM or if - * this VM is {@link - * AdminDistributedSystem - * administering} a distributed system. - * @throws org.apache.geode.GemFireIOException - * Problems while reading configuration properties file or - * while opening the log file. - * @throws org.apache.geode.GemFireConfigException - * The distribution transport is not configured correctly + * @throws IllegalArgumentException If <code>config</code> contains an unknown configuration + * property or a configuration property does not have an allowed value. Note that the + * values of boolean properties are parsed using + * {@link Boolean#valueOf(java.lang.String)}. Therefore all values other than "true" + * values will be considered <code>false</code> -- an exception will not be thrown. + * @throws IllegalStateException If a <code>DistributedSystem</code> with a different + * configuration has already been created in this VM or if this VM is + * {@link AdminDistributedSystem administering} a distributed system. + * @throws org.apache.geode.GemFireIOException Problems while reading configuration properties + * file or while opening the log file. + * @throws org.apache.geode.GemFireConfigException The distribution transport is not configured + * correctly * * @deprecated as of 6.5 use {@link CacheFactory#create} or {@link ClientCacheFactory#create} * instead. @@ -322,6 +311,7 @@ public abstract class DistributedSystem implements StatisticsFactory { /** * see {@link AdminDistributedSystemFactory} + * * @since GemFire 5.7 */ protected static void setEnableAdministrationOnly(boolean adminOnly) { @@ -335,12 +325,11 @@ public abstract class DistributedSystem implements StatisticsFactory { } } - ////////////////////// Constructors ////////////////////// + ////////////////////// Constructors ////////////////////// /** - * Creates a new instance of <code>DistributedSystem</code>. This - * constructor is protected so that it may only be invoked by - * subclasses. + * Creates a new instance of <code>DistributedSystem</code>. This constructor is protected so that + * it may only be invoked by subclasses. */ protected DistributedSystem() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java index 1af954b..7be2db8 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java @@ -2966,6 +2966,7 @@ public class InternalDistributedSystem extends DistributedSystem /** * see {@link AdminDistributedSystemFactory} + * * @since GemFire 5.7 */ public static void setEnableAdministrationOnly(boolean adminOnly) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/GemFireVM.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/GemFireVM.java b/geode-core/src/main/java/org/apache/geode/internal/admin/GemFireVM.java index 206f731..152cd77 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/GemFireVM.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/GemFireVM.java @@ -149,16 +149,18 @@ public interface GemFireVM { public Config getConfig(); /** - * Returns the runtime {@link GemFireMemberStatus} from the vm - * The idea is this snapshot is similar to stats that represent the current state of a - * running VM. However, this is a bit higher level than a stat + * Returns the runtime {@link GemFireMemberStatus} from the vm The idea is this snapshot is + * similar to stats that represent the current state of a running VM. However, this is a bit + * higher level than a stat + * * @since GemFire 5.7 */ public GemFireMemberStatus getSnapshot(); /** - * Returns the runtime {@link RegionSubRegionSnapshot} from the vm - * The idea is this snapshot is quickly salvageable to present a cache's region's info + * Returns the runtime {@link RegionSubRegionSnapshot} from the vm The idea is this snapshot is + * quickly salvageable to present a cache's region's info + * * @since GemFire 5.7 */ public RegionSubRegionSnapshot getRegionSnapshot(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/AdminDistributedSystem.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/AdminDistributedSystem.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/AdminDistributedSystem.java index 607f9d8..5190de1 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/AdminDistributedSystem.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/AdminDistributedSystem.java @@ -44,10 +44,9 @@ public interface AdminDistributedSystem { public String getId(); /** - * Retrieves display friendly name for this system. If this administrative - * VM defined an optional name for its connection to the distributed system, - * that name will be returned. Otherwise the returned value will be {@link - * AdminDistributedSystem#getId}. + * Retrieves display friendly name for this system. If this administrative VM defined an optional + * name for its connection to the distributed system, that name will be returned. Otherwise the + * returned value will be {@link AdminDistributedSystem#getId}. */ public String getName(); @@ -184,8 +183,7 @@ public interface AdminDistributedSystem { * to this system. Note that this list does not include dedicated {@linkplain #getCacheVms cache * server vms}. */ - public SystemMember[] getSystemMemberApplications() - throws AdminException; + public SystemMember[] getSystemMemberApplications() throws AdminException; /** * Display in readable format the latest Alert in this distributed system. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/AdminDistributedSystemFactory.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/AdminDistributedSystemFactory.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/AdminDistributedSystemFactory.java index e22aba3..b4ae72c 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/AdminDistributedSystemFactory.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/AdminDistributedSystemFactory.java @@ -81,8 +81,9 @@ public class AdminDistributedSystemFactory { * colocated distributed system. * <p> * Once it has been enabled be careful to only use GemFire APIs from the - * <code>org.apache.geode.internal.admin</code> package. In particular do not create - * a {@link org.apache.geode.cache.Cache} or a normal {@link DistributedSystem}. + * <code>org.apache.geode.internal.admin</code> package. In particular do not create a + * {@link org.apache.geode.cache.Cache} or a normal {@link DistributedSystem}. + * * @param adminOnly <code>true</code> if this VM should be limited to administration APIs; * <code>false</code> if this VM should allow all GemFire APIs. * @throws IllegalStateException if a {@link DistributedSystem} or {@link AdminDistributedSystem} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/AdminException.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/AdminException.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/AdminException.java index eb016b3..6244733 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/AdminException.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/AdminException.java @@ -12,7 +12,7 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ - + package org.apache.geode.internal.admin.api; import org.apache.geode.GemFireCheckedException; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/AlertLevel.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/AlertLevel.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/AlertLevel.java index 93c0bbd..1bcc0e6 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/AlertLevel.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/AlertLevel.java @@ -18,8 +18,7 @@ import org.apache.geode.internal.admin.Alert; import org.apache.geode.internal.i18n.LocalizedStrings; /** - * Type-safe enumeration for {@link org.apache.geode.internal.admin.api.Alert - * Alert} level. + * Type-safe enumeration for {@link org.apache.geode.internal.admin.api.Alert Alert} level. * * @since GemFire 3.5 * @deprecated as of 7.0 use the <code><a href= http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/CacheDoesNotExistException.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/CacheDoesNotExistException.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/CacheDoesNotExistException.java index 3b476fe..7ff2f06 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/CacheDoesNotExistException.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/CacheDoesNotExistException.java @@ -12,7 +12,7 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ - + package org.apache.geode.internal.admin.api; /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/DistributedSystemConfig.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/DistributedSystemConfig.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/DistributedSystemConfig.java index 052c828..9755d76 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/DistributedSystemConfig.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/DistributedSystemConfig.java @@ -254,11 +254,9 @@ public interface DistributedSystemConfig extends Cloneable { ////////////////////// Instance Methods ////////////////////// /** - * Returns the name of the XML file that specifies the configuration - * of the {@linkplain ManagedEntity - * managed entities} administered by the - * <code>DistributedSystem</code>. The XML file must conform to a - * <a href="doc-files/ds5_0.dtd">dtd</a>. + * Returns the name of the XML file that specifies the configuration of the + * {@linkplain ManagedEntity managed entities} administered by the <code>DistributedSystem</code>. + * The XML file must conform to a <a href="doc-files/ds5_0.dtd">dtd</a>. * * @since GemFire 4.0 */ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/DistributionLocatorConfig.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/DistributionLocatorConfig.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/DistributionLocatorConfig.java index 64e39c5..f331de6 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/DistributionLocatorConfig.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/DistributionLocatorConfig.java @@ -13,6 +13,7 @@ * the License. */ package org.apache.geode.internal.admin.api; + import java.util.Properties; /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/RuntimeAdminException.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/RuntimeAdminException.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/RuntimeAdminException.java index 7f5c54b..6504957 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/RuntimeAdminException.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/RuntimeAdminException.java @@ -12,7 +12,7 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ - + package org.apache.geode.internal.admin.api; /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/StatisticResource.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/StatisticResource.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/StatisticResource.java index afa3af5..8b698dc 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/StatisticResource.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/StatisticResource.java @@ -74,10 +74,9 @@ public interface StatisticResource { * Refreshes the values of every {@link Statistic} in this resource by retrieving them from the * member's VM. * - * @throws AdminException - * if unable to refresh statistic values + * @throws AdminException if unable to refresh statistic values */ public void refresh() throws AdminException; - + } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/SystemMember.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/SystemMember.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/SystemMember.java index 5db7694..98bf598 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/SystemMember.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/SystemMember.java @@ -37,12 +37,11 @@ public interface SystemMember { * {@link #getDistributedMember}. For cache servers it is a unique cache server string. */ public String getId(); - - /** - * Retrieves display friendly name for this member. If this member defined - * an optional name for its connection to the distributed system, that name - * will be returned. Otherwise the returned value will be {@link - * SystemMember#getId}. + + /** + * Retrieves display friendly name for this member. If this member defined an optional name for + * its connection to the distributed system, that name will be returned. Otherwise the returned + * value will be {@link SystemMember#getId}. * * @see org.apache.geode.distributed.DistributedSystem#connect * @see org.apache.geode.distributed.DistributedSystem#getName @@ -85,47 +84,46 @@ public interface SystemMember { * * @param parms subset of the configuration parameters to be changed * @return all configuration parameters including those that were changed - * @throws AdminException - * if this fails to make the configuration changes + * @throws AdminException if this fails to make the configuration changes */ - public ConfigurationParameter[] setConfiguration(ConfigurationParameter[] parms) throws AdminException; - + public ConfigurationParameter[] setConfiguration(ConfigurationParameter[] parms) + throws AdminException; + /** Refreshes this member's configuration from the member or it's properties */ public void refreshConfig() throws AdminException; - - /** - * Retrieves this members statistic resources. If the member is not running - * then an empty array is returned. + + /** + * Retrieves this members statistic resources. If the member is not running then an empty array is + * returned. * * @param statisticsTypeName String ame of the Statistics Type * @return array of runtime statistic resources owned by this member * @since GemFire 5.7 */ public StatisticResource[] getStat(String statisticsTypeName) throws AdminException; - - /** - * Retrieves this members statistic resources. If the member is not running - * then an empty array is returned. All Stats are returned + + /** + * Retrieves this members statistic resources. If the member is not running then an empty array is + * returned. All Stats are returned * * @return array of runtime statistic resources owned by this member */ public StatisticResource[] getStats() throws AdminException; - + /** * Returns whether or not this system member hosts a GemFire {@link org.apache.geode.cache.Cache * Cache}. * * @see #getCache */ - public boolean hasCache() - throws AdminException; + public boolean hasCache() throws AdminException; /** * Returns an object that provides admin access to this member's cache. If the member currently * has no cache then <code>null</code> is returned. */ public SystemMemberCache getCache() throws AdminException; - + /** * Returns the names of the membership roles filled by this member. * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/UnmodifiableConfigurationException.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/UnmodifiableConfigurationException.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/UnmodifiableConfigurationException.java index 5634c09..b4d1668 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/UnmodifiableConfigurationException.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/UnmodifiableConfigurationException.java @@ -12,7 +12,7 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ - + package org.apache.geode.internal.admin.api; /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/AdminDistributedSystemImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/AdminDistributedSystemImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/AdminDistributedSystemImpl.java index ae8dbb5..ef0012f 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/AdminDistributedSystemImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/AdminDistributedSystemImpl.java @@ -74,10 +74,9 @@ import static org.apache.geode.distributed.ConfigurationProperties.*; * @since GemFire 3.5 */ public class AdminDistributedSystemImpl -implements AdminDistributedSystem, - org.apache.geode.internal.admin.JoinLeaveListener, - org.apache.geode.internal.admin.AlertListener, - org.apache.geode.distributed.internal.InternalDistributedSystem.DisconnectListener { + implements AdminDistributedSystem, org.apache.geode.internal.admin.JoinLeaveListener, + org.apache.geode.internal.admin.AlertListener, + org.apache.geode.distributed.internal.InternalDistributedSystem.DisconnectListener { private static final Logger logger = LogService.getLogger(); @@ -239,9 +238,8 @@ implements AdminDistributedSystem, } /** - * Creates <code>CacheServer</code> instances for every cache server - * entry in the {@link - * DistributedSystemConfig} + * Creates <code>CacheServer</code> instances for every cache server entry in the + * {@link DistributedSystemConfig} */ private void initializeCacheServers() { CacheServerConfig[] cacheServerConfigs = this.config.getCacheServerConfigs(); @@ -647,9 +645,8 @@ implements AdminDistributedSystem, * * @return array of system members for each non-manager member */ - public SystemMember[] getSystemMemberApplications() - throws AdminException { - synchronized(this.applicationSet) { + public SystemMember[] getSystemMemberApplications() throws AdminException { + synchronized (this.applicationSet) { Collection coll = new ArrayList(this.applicationSet.size()); APPS: for (Iterator iter = this.applicationSet.iterator(); iter.hasNext();) { Future future = (Future) iter.next(); @@ -1247,8 +1244,7 @@ implements AdminDistributedSystem, * * @throws AdminException TODO-javadocs */ - protected SystemMember createSystemMember(ApplicationVM app) - throws AdminException { + protected SystemMember createSystemMember(ApplicationVM app) throws AdminException { return new SystemMemberImpl(this, app); } @@ -1259,12 +1255,11 @@ implements AdminDistributedSystem, * @param member InternalDistributedMember instance for which a SystemMember instance is to be * constructed. * @return constructed SystemMember instance - * @throws AdminException - * if construction of SystemMember instance fails + * @throws AdminException if construction of SystemMember instance fails * @since GemFire 6.5 */ protected SystemMember createSystemMember(InternalDistributedMember member) - throws AdminException { + throws AdminException { return new SystemMemberImpl(this, member); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/CacheServerImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/CacheServerImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/CacheServerImpl.java index 387a482..f5cb704 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/CacheServerImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/CacheServerImpl.java @@ -49,9 +49,8 @@ public class CacheServerImpl extends ManagedSystemMemberImpl implements CacheVm, * Creates a new <code>CacheServerImpl</code> that represents a non-existsing (unstarted) cache * server in a given distributed system. */ - public CacheServerImpl(AdminDistributedSystemImpl system, - CacheVmConfig config) - throws AdminException { + public CacheServerImpl(AdminDistributedSystemImpl system, CacheVmConfig config) + throws AdminException { super(system, config); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/ConfigurationParameterImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/ConfigurationParameterImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/ConfigurationParameterImpl.java index 7ec18e6..9d94209 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/ConfigurationParameterImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/ConfigurationParameterImpl.java @@ -31,9 +31,8 @@ import java.util.List; * @since GemFire 3.5 * */ -public class ConfigurationParameterImpl -implements ConfigurationParameter { - +public class ConfigurationParameterImpl implements ConfigurationParameter { + /** Identifying name of this configuration parameter */ protected String name; /** Full description of this configuration parameter */ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/ConfigurationParameterListener.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/ConfigurationParameterListener.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/ConfigurationParameterListener.java index 9e41449..0b32df0 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/ConfigurationParameterListener.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/ConfigurationParameterListener.java @@ -17,10 +17,8 @@ package org.apache.geode.internal.admin.api.impl; import org.apache.geode.internal.admin.api.ConfigurationParameter; /** - * Listens to value changes of a - * {@link ConfigurationParameter}. This is for - * internal use only to allow a {@link SystemMemberImpl} to keep track of - * configuration changes made through + * Listens to value changes of a {@link ConfigurationParameter}. This is for internal use only to + * allow a {@link SystemMemberImpl} to keep track of configuration changes made through * {@link ConfigurationParameterImpl#setValue}. * * @since GemFire 3.5 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/ManagedEntityConfigXml.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/ManagedEntityConfigXml.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/ManagedEntityConfigXml.java index 3557751..b173c41 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/ManagedEntityConfigXml.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/ManagedEntityConfigXml.java @@ -23,9 +23,8 @@ import org.xml.sax.*; import java.io.InputStream; /** - * The abstract superclass of classes that convert XML into a {@link - * DistributedSystemConfig} and vice versa. - * It provides helper methods and constants. + * The abstract superclass of classes that convert XML into a {@link DistributedSystemConfig} and + * vice versa. It provides helper methods and constants. * * @since GemFire 4.0 */ @@ -33,7 +32,7 @@ abstract class ManagedEntityConfigXml implements EntityResolver, ErrorHandler { /** The location of the DTD file */ protected static final String DTD_LOCATION = - "/org/apache/geode/internal/admin/doc-files/ds5_0.dtd"; + "/org/apache/geode/internal/admin/doc-files/ds5_0.dtd"; /** The URL for the DTD */ protected static final String SYSTEM_ID = "http://www.gemstone.com/dtd/ds5_0.dtd";; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/ManagedEntityConfigXmlGenerator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/ManagedEntityConfigXmlGenerator.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/ManagedEntityConfigXmlGenerator.java index aaffa8e..b31738d 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/ManagedEntityConfigXmlGenerator.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/ManagedEntityConfigXmlGenerator.java @@ -176,9 +176,8 @@ public class ManagedEntityConfigXmlGenerator extends ManagedEntityConfigXml impl /** * Generates XML for a locator */ - private void generateLocator(DistributionLocatorConfig config) - throws SAXException { - + private void generateLocator(DistributionLocatorConfig config) throws SAXException { + AttributesImpl atts = new AttributesImpl(); atts.addAttribute("", "", PORT, "", String.valueOf(config.getPort())); @@ -192,8 +191,7 @@ public class ManagedEntityConfigXmlGenerator extends ManagedEntityConfigXml impl /** * Generates XML for attributes common to all managed entities. */ - private void generateEntityConfig(ManagedEntityConfig config) - throws SAXException { + private void generateEntityConfig(ManagedEntityConfig config) throws SAXException { String host = config.getHost(); if (host != null) { @@ -291,8 +289,7 @@ public class ManagedEntityConfigXmlGenerator extends ManagedEntityConfigXml impl /** * Generates an XML representation of a <code>CacheServerConfig</code>. */ - private void generateCacheServer(CacheServerConfig config) - throws SAXException { + private void generateCacheServer(CacheServerConfig config) throws SAXException { handler.startElement("", CACHE_SERVER, CACHE_SERVER, EMPTY); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/ManagedEntityControllerFactory.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/ManagedEntityControllerFactory.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/ManagedEntityControllerFactory.java index cd66ee9..d9a93ef 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/ManagedEntityControllerFactory.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/ManagedEntityControllerFactory.java @@ -30,10 +30,12 @@ import org.apache.geode.internal.logging.log4j.LogMarker; public class ManagedEntityControllerFactory { private static final Logger logger = LogService.getLogger(); - - private static final String ENABLED_MANAGED_ENTITY_CONTROLLER_CLASS_NAME = "EnabledManagedEntityController"; - - static ManagedEntityController createManagedEntityController(final AdminDistributedSystem system) { + + private static final String ENABLED_MANAGED_ENTITY_CONTROLLER_CLASS_NAME = + "EnabledManagedEntityController"; + + static ManagedEntityController createManagedEntityController( + final AdminDistributedSystem system) { if (isEnabledManagedEntityController()) { logger.info(LogMarker.CONFIG, "Local and remote OS command invocations are enabled for the Admin API."); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/StatisticImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/StatisticImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/StatisticImpl.java index 9ea9ec5..d9ce318 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/StatisticImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/StatisticImpl.java @@ -24,8 +24,7 @@ import org.apache.geode.internal.admin.api.Statistic; * @since GemFire 3.5 * */ -public class StatisticImpl -implements Statistic { +public class StatisticImpl implements Statistic { private static final long serialVersionUID = 3899296873901634399L; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/StatisticResourceImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/StatisticResourceImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/StatisticResourceImpl.java index 70aedcd..0470a88 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/StatisticResourceImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/StatisticResourceImpl.java @@ -33,8 +33,7 @@ import java.util.List; * * @since GemFire 3.5 */ -public class StatisticResourceImpl -implements StatisticResource { +public class StatisticResourceImpl implements StatisticResource { /** The underlying remote StatResource which this object delegates to */ protected StatResource statResource; @@ -56,14 +55,12 @@ implements StatisticResource { /** * Constructs an instance of StatisticResourceImpl. * - * @param statResource the admin StatResource to manage/monitor - * @param member the SystemMember owning this resource - * @exception AdminException - * if unable to create this StatisticResource for administration + * @param statResource the admin StatResource to manage/monitor + * @param member the SystemMember owning this resource + * @exception AdminException if unable to create this StatisticResource for administration */ - public StatisticResourceImpl(StatResource statResource, - SystemMember member) - throws AdminException { + public StatisticResourceImpl(StatResource statResource, SystemMember member) + throws AdminException { this.statResource = statResource; this.member = member; this.name = this.statResource.getName(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/SystemMemberCacheImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/SystemMemberCacheImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/SystemMemberCacheImpl.java index bc64dc1..c9615f6 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/SystemMemberCacheImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/SystemMemberCacheImpl.java @@ -148,9 +148,7 @@ public class SystemMemberCacheImpl implements SystemMemberCache { return this.statistics; } - public SystemMemberRegion getRegion(String path) - throws AdminException - { + public SystemMemberRegion getRegion(String path) throws AdminException { Region r = this.vm.getRegion(this.info, path); if (r == null) { return null; @@ -243,9 +241,7 @@ public class SystemMemberCacheImpl implements SystemMemberCache { return new StatisticImpl(stat); } - protected SystemMemberRegion createSystemMemberRegion(Region r) - throws AdminException - { + protected SystemMemberRegion createSystemMemberRegion(Region r) throws AdminException { SystemMemberRegionImpl sysMemberRegion = new SystemMemberRegionImpl(this, r); sysMemberRegion.refresh(); return sysMemberRegion; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/SystemMemberImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/SystemMemberImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/SystemMemberImpl.java index 9247698..f292994 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/SystemMemberImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/SystemMemberImpl.java @@ -46,8 +46,7 @@ import java.util.*; * * @since GemFire 3.5 */ -public class SystemMemberImpl -implements SystemMember, ConfigurationParameterListener { +public class SystemMemberImpl implements SystemMember, ConfigurationParameterListener { private static final Logger logger = LogService.getLogger(); @@ -211,8 +210,7 @@ implements SystemMember, ConfigurationParameterListener { return vm.getVersionInfo(); } - public StatisticResource[] getStat(String statisticsTypeName) - throws AdminException { + public StatisticResource[] getStat(String statisticsTypeName) throws AdminException { StatisticResource[] res = new StatisticResource[0]; if (this.vm != null) { res = getStatsImpl(this.vm.getStats(statisticsTypeName)); @@ -220,8 +218,7 @@ implements SystemMember, ConfigurationParameterListener { return res.length == 0 ? null : res; } - public StatisticResource[] getStats() - throws AdminException { + public StatisticResource[] getStats() throws AdminException { StatisticResource[] statsImpl = new StatisticResource[0]; if (this.vm != null) { statsImpl = getStatsImpl(this.vm.getStats(null)); @@ -239,9 +236,7 @@ implements SystemMember, ConfigurationParameterListener { } } - public final SystemMemberCache getCache() - throws AdminException - { + public final SystemMemberCache getCache() throws AdminException { GemFireVM vm = getGemFireVM(); // fix for bug 33505 if (vm == null) return null; @@ -255,9 +250,8 @@ implements SystemMember, ConfigurationParameterListener { return null; } } - - public void refreshConfig() - throws AdminException { + + public void refreshConfig() throws AdminException { GemFireVM vm = getGemFireVM(); if (vm == null) return; @@ -268,8 +262,7 @@ implements SystemMember, ConfigurationParameterListener { * Sets the value of this system member's distribution-related configuration based on the given * <code>Config</code> object. */ - public final void refreshConfig(Config config) - throws AdminException { + public final void refreshConfig(Config config) throws AdminException { if (config == null) { throw new AdminException( LocalizedStrings.SystemMemberImpl_FAILED_TO_REFRESH_CONFIGURATION_PARAMETERS_FOR_0 @@ -332,11 +325,11 @@ implements SystemMember, ConfigurationParameterListener { // ------------------------------------------------------------------------- // Listener callbacks // ------------------------------------------------------------------------- - + // -- ConfigurationParameterListener --- public void configurationParameterValueChanged(ConfigurationParameter parm) { try { - setConfiguration(new ConfigurationParameter[] { parm }); + setConfiguration(new ConfigurationParameter[] {parm}); } catch (AdminException e) { // this shouldn't occur since this is a config listener method... logger.warn(e.getMessage(), e); @@ -441,8 +434,7 @@ implements SystemMember, ConfigurationParameterListener { * @param stat the internal stat resource to wrap with {@link StatisticResource} * @return new impl instance of {@link StatisticResource} */ - protected StatisticResource createStatisticResource(StatResource stat) - throws AdminException { + protected StatisticResource createStatisticResource(StatResource stat) throws AdminException { return new StatisticResourceImpl(stat, this); } @@ -467,15 +459,12 @@ implements SystemMember, ConfigurationParameterListener { * @param vm the GemFire vm to retrieve cache info from * @return new impl instance of {@link SystemMemberCache} */ - protected SystemMemberCache createSystemMemberCache(GemFireVM vm) - throws AdminException - { + protected SystemMemberCache createSystemMemberCache(GemFireVM vm) throws AdminException { return new SystemMemberCacheImpl(vm); } /** Wrap the internal stats with impls of {@link StatisticResource} */ - protected StatisticResource[] getStatsImpl(StatResource[] stats) - throws AdminException { + protected StatisticResource[] getStatsImpl(StatResource[] stats) throws AdminException { List statList = new ArrayList(); for (int i = 0; i < stats.length; i++) { statList.add(createStatisticResource(stats[i])); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/SystemMemberRegionImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/SystemMemberRegionImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/SystemMemberRegionImpl.java index b859ad9..87a06b8 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/SystemMemberRegionImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/impl/SystemMemberRegionImpl.java @@ -15,8 +15,8 @@ package org.apache.geode.internal.admin.api.impl; import org.apache.geode.cache.*; -//import org.apache.geode.internal.Assert; -//import org.apache.geode.internal.admin.*; +// import org.apache.geode.internal.Assert; +// import org.apache.geode.internal.admin.*; import org.apache.geode.internal.admin.api.AdminException; import org.apache.geode.internal.admin.api.SystemMemberRegion; import org.apache.geode.internal.admin.remote.*; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/AgentConfig.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/AgentConfig.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/AgentConfig.java index ee2aa25..3a130ae 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/AgentConfig.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/AgentConfig.java @@ -16,7 +16,7 @@ package org.apache.geode.internal.admin.api.jmx; import org.apache.geode.internal.admin.api.DistributedSystemConfig; import org.apache.geode.distributed.internal.DistributionConfig; -//import InetAddressUtil; +// import InetAddressUtil; /** * A configuration object for a JMX administration {@linkplain Agent agent} that is hosted by a http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/AdminDistributedSystemJmxImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/AdminDistributedSystemJmxImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/AdminDistributedSystemJmxImpl.java index 969833d..7998091 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/AdminDistributedSystemJmxImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/AdminDistributedSystemJmxImpl.java @@ -104,8 +104,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl * * @param config configuration defining the JMX agent. */ - public AdminDistributedSystemJmxImpl(AgentConfigImpl config) - throws AdminException { + public AdminDistributedSystemJmxImpl(AgentConfigImpl config) throws AdminException { super(config); this.mbeanName = "GemFire:type=AdminDistributedSystem,id=" + MBeanUtil.makeCompliantMBeanNameProperty(getId()); @@ -225,8 +224,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl /** Override createSystemMember by instantiating SystemMemberJmxImpl */ @Override - protected SystemMember createSystemMember(ApplicationVM app) - throws AdminException { + protected SystemMember createSystemMember(ApplicationVM app) throws AdminException { return new SystemMemberJmxImpl(this, app); } @@ -237,8 +235,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl * @param member InternalDistributedMember instance for which a SystemMember instance is to be * constructed. * @return constructed SystemMember instance - * @throws AdminException - * if construction of SystemMember instance fails + * @throws AdminException if construction of SystemMember instance fails * * @since GemFire 6.5 */ @@ -249,8 +246,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl @Override - protected CacheServer createCacheServer(ApplicationVM member) - throws AdminException { + protected CacheServer createCacheServer(ApplicationVM member) throws AdminException { return new CacheServerJmxImpl(this, member); } @@ -263,8 +259,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl /** Override createGemFireHealth by instantiating GemFireHealthJmxImpl */ @Override - protected GemFireHealth createGemFireHealth(GfManagerAgent system) - throws AdminException { + protected GemFireHealth createGemFireHealth(GfManagerAgent system) throws AdminException { if (system == null) { throw new IllegalStateException( LocalizedStrings.AdminDistributedSystemJmxImpl_GFMANAGERAGENT_MUST_NOT_BE_NULL @@ -435,7 +430,7 @@ public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl } catch (javax.management.MBeanException e) { logger.warn(e.getMessage(), e); } - + SystemMemberType memberType = member.getType(); if (/* member != null && */ memberType.isApplication() || memberType.isCacheVm()) { // automatically unregister the MBean... http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/AgentConfigImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/AgentConfigImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/AgentConfigImpl.java index 1ed77f3..5652b1a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/AgentConfigImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/AgentConfigImpl.java @@ -1489,10 +1489,8 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen // HttpAdaptor property validators... /** - * Returns {@link - * AgentConfig#DEFAULT_HTTP_PORT} - * if httpPort is empty; else validates - * that it's an integer and returns the int form. + * Returns {@link AgentConfig#DEFAULT_HTTP_PORT} if httpPort is empty; else validates that it's an + * integer and returns the int form. */ private int validateHttpPort(String val) { if (isEmpty(val)) { @@ -1503,9 +1501,8 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen } /** - * Validates that httpPort is either zero or within the {@link - * AgentConfig#MIN_HTTP_PORT} and {@link - * AgentConfig#MAX_HTTP_PORT} values. + * Validates that httpPort is either zero or within the {@link AgentConfig#MIN_HTTP_PORT} and + * {@link AgentConfig#MAX_HTTP_PORT} values. */ private int validateHttpPort(int val) { if (val < 0 || val > MAX_HTTP_PORT) { @@ -1518,9 +1515,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen } /** - * Returns {@link - * AgentConfig#DEFAULT_HTTP_BIND_ADDRESS} - * unless httpBindAddress can be used to + * Returns {@link AgentConfig#DEFAULT_HTTP_BIND_ADDRESS} unless httpBindAddress can be used to * create a valid InetAddress. */ private String validateHttpBindAddress(String val) { @@ -1546,9 +1541,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen // SnmpAdaptor property validators... /** - * Returns {@link - * AgentConfig#DEFAULT_SNMP_BIND_ADDRESS} - * unless snmpBindAddress can be used to + * Returns {@link AgentConfig#DEFAULT_SNMP_BIND_ADDRESS} unless snmpBindAddress can be used to * create a valid InetAddress. */ private String validateSnmpBindAddress(String val) { @@ -1589,9 +1582,8 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen // RMIConnectorServer property validators... /** - * Returns {@link AgentConfig#DEFAULT_RMI_PORT} - * if rmiPort is empty; else validates - * that it's an integer and returns the int form. + * Returns {@link AgentConfig#DEFAULT_RMI_PORT} if rmiPort is empty; else validates that it's an + * integer and returns the int form. */ private int validateRmiPort(String val) { if (isEmpty(val)) { @@ -1602,10 +1594,8 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen } /** - * Validates that rmiPort is either zero or within the {@link - * AgentConfig#MIN_RMI_PORT} - * and {@link AgentConfig#MAX_RMI_PORT} - * values. + * Validates that rmiPort is either zero or within the {@link AgentConfig#MIN_RMI_PORT} and + * {@link AgentConfig#MAX_RMI_PORT} values. */ private int validateRmiPort(int val) { if (val < MIN_RMI_PORT || val > MAX_RMI_PORT) { @@ -1618,9 +1608,8 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen } /** - * Returns {@link AgentConfig#DEFAULT_RMI_SERVER_PORT} - * if rmi-server-port is empty; else validates that it's an integer within the - * allowed range and returns the int form. + * Returns {@link AgentConfig#DEFAULT_RMI_SERVER_PORT} if rmi-server-port is empty; else validates + * that it's an integer within the allowed range and returns the int form. */ private int validateRmiServerPort(String val) { if (isEmpty(val)) { @@ -1631,10 +1620,8 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen } /** - * Validates that rmiPort is either zero or within the {@link - * AgentConfig#MIN_RMI_PORT} - * and {@link AgentConfig#MAX_RMI_PORT} - * values. + * Validates that rmiPort is either zero or within the {@link AgentConfig#MIN_RMI_PORT} and + * {@link AgentConfig#MAX_RMI_PORT} values. */ private int validateRmiServerPort(int val) { if (val < MIN_RMI_PORT || val > MAX_RMI_PORT) { @@ -1647,10 +1634,8 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen } /** - * Returns {@link - * AgentConfig#DEFAULT_RMI_BIND_ADDRESS} - * unless rmiBindAddress can be used to create a - * valid InetAddress. + * Returns {@link AgentConfig#DEFAULT_RMI_BIND_ADDRESS} unless rmiBindAddress can be used to + * create a valid InetAddress. */ private String validateRmiBindAddress(String val) { String value = InetAddressUtil.validateHost(val); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/AgentImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/AgentImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/AgentImpl.java index 760a5a8..6dbf134 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/AgentImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/AgentImpl.java @@ -79,8 +79,7 @@ import org.apache.geode.internal.logging.log4j.LogWriterAppenders; * * @since GemFire 3.5 */ -public class AgentImpl -implements Agent, ManagedResource { +public class AgentImpl implements Agent, ManagedResource { private static final Logger logger = LogService.getLogger(); @@ -874,7 +873,8 @@ implements Agent, ManagedResource { /** * Creates a LogWriterI18n for this Agent to use in logging. */ - @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE", justification="Return value for file delete is not important here.") + @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "RV_RETURN_VALUE_IGNORED_BAD_PRACTICE", + justification = "Return value for file delete is not important here.") private void initLogWriter() throws AdminException { final LogConfig logConfig = this.agentConfig.createLogConfig(); @@ -1029,7 +1029,7 @@ implements Agent, ManagedResource { * @param config */ private AdminDistributedSystem createDistributedSystem(AgentConfigImpl config) - throws AdminException { + throws AdminException { return new AdminDistributedSystemJmxImpl(config); } @@ -1040,8 +1040,8 @@ implements Agent, ManagedResource { /** * Command-line main for running the GemFire Management Agent. * <p> - * Accepts command-line arguments matching the options in {@link AgentConfig} - * and {@link DistributedSystemConfig}. + * Accepts command-line arguments matching the options in {@link AgentConfig} and + * {@link DistributedSystemConfig}. * <p> * <code>AgentConfig</code> will convert -Jarguments to System properties. */ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/CacheServerJmxImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/CacheServerJmxImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/CacheServerJmxImpl.java index c4c13e1..ef6c7c4 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/CacheServerJmxImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/CacheServerJmxImpl.java @@ -50,8 +50,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings; import org.apache.geode.internal.logging.LogService; /** - * MBean representation of a {@link - * CacheVm}. + * MBean representation of a {@link CacheVm}. * * @since GemFire 4.0 */ @@ -291,9 +290,8 @@ public class CacheServerJmxImpl extends CacheServerImpl // MBean Operations // ------------------------------------------------------------------------- - public void refreshConfig() - throws AdminException { - // 1st call to refreshConfig would trigger + public void refreshConfig() throws AdminException { + // 1st call to refreshConfig would trigger // the auto-refresh if an interval is set if (this.refreshInterval > 0) { this._setRefreshInterval(this.refreshInterval); @@ -408,8 +406,7 @@ public class CacheServerJmxImpl extends CacheServerImpl * @throws AdminException if constructing StatisticResourceJmxImpl instance fails */ @Override - protected StatisticResource createStatisticResource(StatResource stat) - throws AdminException { + protected StatisticResource createStatisticResource(StatResource stat) throws AdminException { StatisticResourceJmxImpl managedStatisticResource = null; synchronized (this.managedStatisticsResourcesMap) { @@ -437,8 +434,7 @@ public class CacheServerJmxImpl extends CacheServerImpl * @throws AdminException if constructing SystemMemberCacheJmxImpl instance fails */ @Override - protected SystemMemberCache createSystemMemberCache(GemFireVM vm) - throws AdminException { + protected SystemMemberCache createSystemMemberCache(GemFireVM vm) throws AdminException { if (managedSystemMemberCache == null) { managedSystemMemberCache = new SystemMemberCacheJmxImpl(vm); } @@ -456,8 +452,7 @@ public class CacheServerJmxImpl extends CacheServerImpl * @return a new instance of ManagedBean copied from <code>managed</code> but with the new * attributes added */ - public ManagedBean addDynamicAttributes(ManagedBean managed) - throws AdminException { + public ManagedBean addDynamicAttributes(ManagedBean managed) throws AdminException { return Helper.addDynamicAttributes(this, managed); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/ConfigAttributeInfo.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/ConfigAttributeInfo.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/ConfigAttributeInfo.java index b89b099..e94f521 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/ConfigAttributeInfo.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/ConfigAttributeInfo.java @@ -21,11 +21,10 @@ import javax.management.Descriptor; import javax.management.modelmbean.DescriptorSupport; import javax.management.modelmbean.ModelMBeanAttributeInfo; -/** - * Subclass of AttributeInfo with {@link - * ConfigurationParameter} added for use as the - * {@link javax.management.modelmbean.ModelMBeanAttributeInfo} descriptor's - * <i>targetObject</i> value. +/** + * Subclass of AttributeInfo with {@link ConfigurationParameter} added for use as the + * {@link javax.management.modelmbean.ModelMBeanAttributeInfo} descriptor's <i>targetObject</i> + * value. * * @since GemFire 3.5 * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/ConfigurationParameterJmxImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/ConfigurationParameterJmxImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/ConfigurationParameterJmxImpl.java index d2d6ae8..0476fdb 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/ConfigurationParameterJmxImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/ConfigurationParameterJmxImpl.java @@ -38,9 +38,8 @@ import org.apache.geode.internal.i18n.LocalizedStrings; * @since GemFire 3.5 * */ -public class ConfigurationParameterJmxImpl -extends ConfigurationParameterImpl -implements Serializable { +public class ConfigurationParameterJmxImpl extends ConfigurationParameterImpl + implements Serializable { private static final long serialVersionUID = -7822171853906772375L; private boolean deserialized = false; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/DistributedSystemHealthConfigJmxImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/DistributedSystemHealthConfigJmxImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/DistributedSystemHealthConfigJmxImpl.java index 44f044f..af13bbb 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/DistributedSystemHealthConfigJmxImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/DistributedSystemHealthConfigJmxImpl.java @@ -30,9 +30,8 @@ import javax.management.modelmbean.*; * * @since GemFire 3.5 */ -public class DistributedSystemHealthConfigJmxImpl - extends DistributedSystemHealthConfigImpl - implements ManagedResource { +public class DistributedSystemHealthConfigJmxImpl extends DistributedSystemHealthConfigImpl + implements ManagedResource { /** The <code>GemFireHealth</code> that we help configure */ private GemFireHealth health; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/DistributionLocatorJmxImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/DistributionLocatorJmxImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/DistributionLocatorJmxImpl.java index 68f1f5b..8da7482 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/DistributionLocatorJmxImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/DistributionLocatorJmxImpl.java @@ -25,10 +25,8 @@ import javax.management.modelmbean.ModelMBean; * Provides MBean support for managing a distribution locator. * */ -public class DistributionLocatorJmxImpl -extends DistributionLocatorImpl -implements ManagedResource, - DistributionLocatorConfig { +public class DistributionLocatorJmxImpl extends DistributionLocatorImpl + implements ManagedResource, DistributionLocatorConfig { /** The JMX object name of this managed resource */ private ObjectName objectName; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/GenerateMBeanHTML.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/GenerateMBeanHTML.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/GenerateMBeanHTML.java index bdf4d36..75c718e 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/GenerateMBeanHTML.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/GenerateMBeanHTML.java @@ -32,7 +32,8 @@ import java.io.*; public class GenerateMBeanHTML extends DefaultHandler { /** The location of the DTD for the MBean descriptions */ - private static final String DTD_LOCATION = "/org/apache/geode/internal/admin/api/jmx/impl/doc-files/mbeans-descriptors.dtd"; + private static final String DTD_LOCATION = + "/org/apache/geode/internal/admin/api/jmx/impl/doc-files/mbeans-descriptors.dtd"; // /** The system id of MBean description's DTD */ // private static final String SYSTEM_ID = http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/MBeanUtil.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/MBeanUtil.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/MBeanUtil.java index 9e4ad36..bad36f0 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/MBeanUtil.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/MBeanUtil.java @@ -158,10 +158,11 @@ public class MBeanUtil { LocalizedStrings.MBeanUtil_MBEAN_SERVER_NOT_INITIALIZED_YET.toLocalizedString()); } registry.setMBeanServer(mbeanServer); - - String mbeansResource = getOSPath("/org/apache/geode/internal/admin/api/jmx/mbeans-descriptors.xml"); - //System.out.println(LocalizedStrings.MBeanUtil_LOADING_RESOURCE_0.toLocalizedString(mbeansResource)); - + + String mbeansResource = + getOSPath("/org/apache/geode/internal/admin/api/jmx/mbeans-descriptors.xml"); + // System.out.println(LocalizedStrings.MBeanUtil_LOADING_RESOURCE_0.toLocalizedString(mbeansResource)); + URL url = ClassPathLoader.getLatest().getResource(MBeanUtil.class, mbeansResource); raiseOnFailure(url != null, LocalizedStrings.MBeanUtil_FAILED_TO_FIND_0 .toLocalizedString(new Object[] {mbeansResource})); @@ -286,8 +287,7 @@ public class MBeanUtil { } // customize the defn... - managed.setClassName( - "MX4JModelMBean"); + managed.setClassName("MX4JModelMBean"); return managed; } @@ -666,7 +666,7 @@ public class MBeanUtil { } } } - + // ----- borrowed the following from RemoteCommand ----- /** Translates the path between Windows and UNIX. */ static String getOSPath(String path) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/ManagedResourceType.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/ManagedResourceType.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/ManagedResourceType.java index bae10b8..48da3a0 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/ManagedResourceType.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/ManagedResourceType.java @@ -41,47 +41,46 @@ public class ManagedResourceType implements java.io.Serializable { private static final long serialVersionUID = 3752874768667480449L; /** Agent managed resource type */ - public static final ManagedResourceType AGENT = - new ManagedResourceType("Agent", Agent.class); + public static final ManagedResourceType AGENT = new ManagedResourceType("Agent", Agent.class); /** DistributedSystem managed resource type */ - public static final ManagedResourceType DISTRIBUTED_SYSTEM = + public static final ManagedResourceType DISTRIBUTED_SYSTEM = new ManagedResourceType("AdminDistributedSystem", AdminDistributedSystem.class); /** SystemMember managed resource type */ - public static final ManagedResourceType SYSTEM_MEMBER = + public static final ManagedResourceType SYSTEM_MEMBER = new ManagedResourceType("SystemMember", SystemMember.class); /** SystemMemberCache managed resource type */ - public static final ManagedResourceType SYSTEM_MEMBER_CACHE = + public static final ManagedResourceType SYSTEM_MEMBER_CACHE = new ManagedResourceType("SystemMemberCache", SystemMemberCache.class); /** SystemMemberCache managed resource type */ - public static final ManagedResourceType SYSTEM_MEMBER_REGION = + public static final ManagedResourceType SYSTEM_MEMBER_REGION = new ManagedResourceType("SystemMemberRegion", SystemMemberRegion.class); /** SystemMemberCacheServer managed resource type */ - public static final ManagedResourceType SYSTEM_MEMBER_CACHE_SERVER = + public static final ManagedResourceType SYSTEM_MEMBER_CACHE_SERVER = new ManagedResourceType("SystemMemberCacheServer", SystemMemberCacheServer.class); /** CacheVm managed resource type */ - public static final ManagedResourceType CACHE_VM = + public static final ManagedResourceType CACHE_VM = new ManagedResourceType("CacheVm", CacheVm.class); /** StatisticResource managed resource type */ - public static final ManagedResourceType STATISTIC_RESOURCE = + public static final ManagedResourceType STATISTIC_RESOURCE = new ManagedResourceType("StatisticResource", StatisticResource.class); - public static final ManagedResourceType GEMFIRE_HEALTH = + public static final ManagedResourceType GEMFIRE_HEALTH = new ManagedResourceType("GemFireHealth", GemFireHealth.class); - public static final ManagedResourceType DISTRIBUTED_SYSTEM_HEALTH_CONFIG = + public static final ManagedResourceType DISTRIBUTED_SYSTEM_HEALTH_CONFIG = new ManagedResourceType("DistributedSystemHealthConfig", DistributedSystemHealthConfig.class); - public static final ManagedResourceType GEMFIRE_HEALTH_CONFIG = + public static final ManagedResourceType GEMFIRE_HEALTH_CONFIG = new ManagedResourceType("GemFireHealthConfig", GemFireHealthConfig.class); - public static final ManagedResourceType DISTRIBUTION_LOCATOR = + public static final ManagedResourceType DISTRIBUTION_LOCATOR = new ManagedResourceType("DistributionLocator", DistributionLocator.class); //////////////////// Instance Fields //////////////////// http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/MemberInfoWithStatsMBean.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/MemberInfoWithStatsMBean.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/MemberInfoWithStatsMBean.java index 44c9795..95fd01c 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/MemberInfoWithStatsMBean.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/MemberInfoWithStatsMBean.java @@ -83,10 +83,10 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No private ObjectName objectName; /** version of the GemFire Enterprise system that is running */ - private String version; - private int refreshInterval; - private String id; - + private String version; + private int refreshInterval; + private String id; + private Agent agent; private AdminDistributedSystemJmxImpl adminDSJmx; @@ -98,7 +98,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements No * * @param agent Admin Agent instance * @throws OperationsException if ObjectName can't be formed for this MBean - * @throws MBeanRegistrationException + * @throws MBeanRegistrationException * @throws AdminException */ MemberInfoWithStatsMBean(Agent agent) http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/StatisticAttributeInfo.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/StatisticAttributeInfo.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/StatisticAttributeInfo.java index 1d5b9b4..ec675f1 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/StatisticAttributeInfo.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/StatisticAttributeInfo.java @@ -21,11 +21,10 @@ import javax.management.Descriptor; import javax.management.modelmbean.DescriptorSupport; import javax.management.modelmbean.ModelMBeanAttributeInfo; -/** - * Subclass of AttributeInfo with {@link Statistic} - * added for use as the {@link - * javax.management.modelmbean.ModelMBeanAttributeInfo} descriptor's - * <i>targetObject</i> value. +/** + * Subclass of AttributeInfo with {@link Statistic} added for use as the + * {@link javax.management.modelmbean.ModelMBeanAttributeInfo} descriptor's <i>targetObject</i> + * value. * * @since GemFire 3.5 * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/StatisticResourceJmxImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/StatisticResourceJmxImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/StatisticResourceJmxImpl.java index 1d18889..f7b776b 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/StatisticResourceJmxImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/StatisticResourceJmxImpl.java @@ -38,9 +38,8 @@ import org.apache.geode.internal.logging.LogService; * @since GemFire 3.5 * */ -public class StatisticResourceJmxImpl -extends StatisticResourceImpl -implements javax.management.NotificationListener, ManagedResource { +public class StatisticResourceJmxImpl extends StatisticResourceImpl + implements javax.management.NotificationListener, ManagedResource { private static final Logger logger = LogService.getLogger(); @@ -62,27 +61,24 @@ implements javax.management.NotificationListener, ManagedResource { /** * Constructor for the StatisticResource object * - * @param statResource the admin StatResource to manage/monitor - * @param member the SystemMember owning this resource - * @exception AdminException - * if unable to create this StatisticResource for administration + * @param statResource the admin StatResource to manage/monitor + * @param member the SystemMember owning this resource + * @exception AdminException if unable to create this StatisticResource for administration */ - public StatisticResourceJmxImpl(StatResource statResource, - SystemMemberJmx member) - throws AdminException { + public StatisticResourceJmxImpl(StatResource statResource, SystemMemberJmx member) + throws AdminException { super(statResource, member); initializeMBean(); } /** Create and register the MBean to manage this resource */ - private void initializeMBean() - throws AdminException { - this.mbeanName = new StringBuffer("GemFire.Statistic:") - .append("source=").append(MBeanUtil.makeCompliantMBeanNameProperty(this.member.getId())) - .append(",type=").append(MBeanUtil.makeCompliantMBeanNameProperty(getType())) - .append(",name=").append(MBeanUtil.makeCompliantMBeanNameProperty(getName())) - .append(",uid=").append(getUniqueId()).toString(); - + private void initializeMBean() throws AdminException { + this.mbeanName = new StringBuffer("GemFire.Statistic:").append("source=") + .append(MBeanUtil.makeCompliantMBeanNameProperty(this.member.getId())).append(",type=") + .append(MBeanUtil.makeCompliantMBeanNameProperty(getType())).append(",name=") + .append(MBeanUtil.makeCompliantMBeanNameProperty(getName())).append(",uid=") + .append(getUniqueId()).toString(); + this.objectName = MBeanUtil.createMBean(this, addDynamicAttributes(MBeanUtil.lookupManagedBean(this))); @@ -228,8 +224,7 @@ implements javax.management.NotificationListener, ManagedResource { * @return a new instance of ManagedBean copied from <code>managed</code> but with the new * attributes added */ - ManagedBean addDynamicAttributes(ManagedBean managed) - throws AdminException { + ManagedBean addDynamicAttributes(ManagedBean managed) throws AdminException { if (managed == null) { throw new IllegalArgumentException( LocalizedStrings.StatisticResourceJmxImpl_MANAGEDBEAN_IS_NULL.toLocalizedString()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/SystemMemberBridgeServerJmxImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/SystemMemberBridgeServerJmxImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/SystemMemberBridgeServerJmxImpl.java index 72e3468..b40cc65 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/SystemMemberBridgeServerJmxImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/SystemMemberBridgeServerJmxImpl.java @@ -25,8 +25,7 @@ import javax.management.ObjectName; import javax.management.modelmbean.ModelMBean; /** - * MBean representation of a {@link - * SystemMemberBridgeServer}. + * MBean representation of a {@link SystemMemberBridgeServer}. * * @since GemFire 4.0 */ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a672c7d3/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/SystemMemberCacheJmxImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/SystemMemberCacheJmxImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/SystemMemberCacheJmxImpl.java index abbd6cb..2e21b87 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/SystemMemberCacheJmxImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/api/jmx/impl/SystemMemberCacheJmxImpl.java @@ -45,9 +45,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings; * * @since GemFire 3.5 */ -public class SystemMemberCacheJmxImpl -extends SystemMemberCacheImpl -implements ManagedResource { +public class SystemMemberCacheJmxImpl extends SystemMemberCacheImpl implements ManagedResource { /** The object name of this managed resource */ private ObjectName objectName; @@ -67,22 +65,16 @@ implements ManagedResource { * * @param vm The vm owning the cache this object will manage */ - public SystemMemberCacheJmxImpl(GemFireVM vm) - throws AdminException { + public SystemMemberCacheJmxImpl(GemFireVM vm) throws AdminException { super(vm); initializeMBean(); } /** Create and register the MBean to manage this resource */ - private void initializeMBean() - throws AdminException { - this.mbeanName = new StringBuffer("GemFire.Cache:") - .append("name=") - .append(MBeanUtil.makeCompliantMBeanNameProperty(getName())) - .append(",id=") - .append(getId()) - .append(",owner=") - .append(MBeanUtil.makeCompliantMBeanNameProperty(vm.getId().toString())) + private void initializeMBean() throws AdminException { + this.mbeanName = new StringBuffer("GemFire.Cache:").append("name=") + .append(MBeanUtil.makeCompliantMBeanNameProperty(getName())).append(",id=").append(getId()) + .append(",owner=").append(MBeanUtil.makeCompliantMBeanNameProperty(vm.getId().toString())) .append(",type=Cache").toString(); this.objectName = @@ -102,8 +94,7 @@ implements ManagedResource { * @throws AdminException if constructing SystemMemberRegionJmxImpl instance fails */ @Override - protected SystemMemberRegion createSystemMemberRegion(Region r) - throws AdminException { + protected SystemMemberRegion createSystemMemberRegion(Region r) throws AdminException { SystemMemberRegionJmxImpl managedSystemMemberRegion = null; boolean needsRefresh = false; synchronized (this.managedRegionResourcesMap) { @@ -165,8 +156,7 @@ implements ManagedResource { * @return a new instance of ManagedBean copied from <code>managed</code> but with the new * attributes added */ - ManagedBean addDynamicAttributes(ManagedBean managed) - throws AdminException { + ManagedBean addDynamicAttributes(ManagedBean managed) throws AdminException { if (managed == null) { throw new IllegalArgumentException( LocalizedStrings.SystemMemberCacheJmxImpl_MANAGEDBEAN_IS_NULL.toLocalizedString());
