Repository: geode Updated Branches: refs/heads/feature/GEODE-2632-12 db79d2238 -> b4efc0444
fixup Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/b4efc044 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/b4efc044 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/b4efc044 Branch: refs/heads/feature/GEODE-2632-12 Commit: b4efc0444d0603078936cc46c8364c0b01d177e4 Parents: db79d22 Author: Kirk Lund <kl...@apache.org> Authored: Fri May 5 14:48:03 2017 -0700 Committer: Kirk Lund <kl...@apache.org> Committed: Fri May 5 14:48:03 2017 -0700 ---------------------------------------------------------------------- .../geode/management/ManagementService.java | 9 ++-- .../gms/mgr/GMSMembershipManagerJUnitTest.java | 50 +++++++++++++------- 2 files changed, 37 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/b4efc044/geode-core/src/main/java/org/apache/geode/management/ManagementService.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/ManagementService.java b/geode-core/src/main/java/org/apache/geode/management/ManagementService.java index f09665a..faada65 100755 --- a/geode-core/src/main/java/org/apache/geode/management/ManagementService.java +++ b/geode-core/src/main/java/org/apache/geode/management/ManagementService.java @@ -21,11 +21,10 @@ import javax.management.ObjectName; import org.apache.geode.cache.Cache; import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.management.internal.BaseManagementService; import org.apache.geode.management.membership.MembershipListener; - - /** * Interface to the GemFire management service for a single Cache. * @@ -33,14 +32,13 @@ import org.apache.geode.management.membership.MembershipListener; */ public abstract class ManagementService { - /** * Returns a newly created or the existing instance of the management service for a cache. * * @param cache Cache for which to get the management service. */ public static ManagementService getManagementService(Cache cache) { - return BaseManagementService.getManagementService(cache); + return BaseManagementService.getManagementService((InternalCache) cache); } /** @@ -50,7 +48,7 @@ public abstract class ManagementService { * @return The existing management service if one exists, null otherwise. */ public static ManagementService getExistingManagementService(Cache cache) { - return BaseManagementService.getExistingManagementService(cache); + return BaseManagementService.getExistingManagementService((InternalCache) cache); } /** @@ -300,7 +298,6 @@ public abstract class ManagementService { public abstract ObjectName getGatewaySenderMBeanName(DistributedMember member, String gatwaySenderId); - /** * Returns the object name of the AsyncEventQueueMBean representing a asynchronous queue. This is * a utility method for generating an object name and it does not register an MBean. http://git-wip-us.apache.org/repos/asf/geode/blob/b4efc044/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java index 8c82a6f..071af6d 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java @@ -14,8 +14,41 @@ */ package org.apache.geode.distributed.internal.membership.gms.mgr; +import static org.apache.geode.distributed.ConfigurationProperties.*; +import static org.junit.Assert.*; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyInt; +import static org.mockito.Matchers.isA; +import static org.mockito.Mockito.*; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.HashSet; +import java.util.List; +import java.util.Properties; +import java.util.Random; +import java.util.Set; +import java.util.Timer; + +import org.assertj.core.api.Assertions; +import org.jgroups.util.UUID; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import org.apache.geode.distributed.DistributedSystemDisconnectedException; -import org.apache.geode.distributed.internal.*; +import org.apache.geode.distributed.internal.DM; +import org.apache.geode.distributed.internal.DMStats; +import org.apache.geode.distributed.internal.DistributionConfig; +import org.apache.geode.distributed.internal.DistributionConfigImpl; +import org.apache.geode.distributed.internal.DistributionManager; +import org.apache.geode.distributed.internal.DistributionMessage; +import org.apache.geode.distributed.internal.HighPriorityAckedMessage; +import org.apache.geode.distributed.internal.InternalDistributedSystem; +import org.apache.geode.distributed.internal.MembershipListener; +import org.apache.geode.distributed.internal.ReplyProcessor21; import org.apache.geode.distributed.internal.direct.DirectChannel; import org.apache.geode.distributed.internal.membership.DistributedMembershipListener; import org.apache.geode.distributed.internal.membership.InternalDistributedMember; @@ -35,21 +68,6 @@ import org.apache.geode.internal.admin.remote.RemoteTransportConfig; import org.apache.geode.internal.tcp.ConnectExceptions; import org.apache.geode.test.junit.categories.MembershipTest; import org.apache.geode.test.junit.categories.UnitTest; -import org.assertj.core.api.Assertions; -import org.jgroups.util.UUID; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import java.util.*; - -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.junit.Assert.*; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.isA; -import static org.mockito.Mockito.*; @Category({UnitTest.class, MembershipTest.class}) public class GMSMembershipManagerJUnitTest {
