GEODE-8252: Rename DistributedErrorCollector (#5563)

Rename SharedErrorCollector as DistributedErrorCollector.
apache · Sep 30, 2020 · 581b68d · 581b68d
1 parent 8ee4841
commit 581b68d
Show file tree

Hide file tree

Showing 16 changed files with 59 additions and 60 deletions.
diff --git a/...t/java/org/apache/geode/management/internal/cli/commands/StartServerCommandDUnitTest.java b/...t/java/org/apache/geode/management/internal/cli/commands/StartServerCommandDUnitTest.java
@@ -68,8 +68,8 @@
 import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
 import org.apache.geode.management.internal.i18n.CliStrings;
 import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
 import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
 import org.apache.geode.test.junit.rules.GfshCommandRule;
 import org.apache.geode.test.junit.rules.RequiresGeodeHome;
 import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
@@ -94,7 +94,7 @@ public class StartServerCommandDUnitTest implements Serializable {
   public static GfshCommandRule gfsh = new GfshCommandRule();
 
   @Rule
-  public SharedErrorCollector errorCollector = new SharedErrorCollector();
+  public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
 
   @Rule
   public SerializableTemporaryFolder temporaryFolder = new SerializableTemporaryFolder();

diff --git a/...rc/distributedTest/java/org/apache/geode/cache/ReplicateCacheListenerDistributedTest.java b/...rc/distributedTest/java/org/apache/geode/cache/ReplicateCacheListenerDistributedTest.java
@@ -31,9 +31,9 @@
 
 import org.apache.geode.cache.util.CacheListenerAdapter;
 import org.apache.geode.test.dunit.rules.CacheRule;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
 import org.apache.geode.test.dunit.rules.DistributedRule;
 import org.apache.geode.test.dunit.rules.SharedCountersRule;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
 import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
 
 /**
@@ -72,7 +72,7 @@ public class ReplicateCacheListenerDistributedTest implements Serializable {
   public SharedCountersRule sharedCountersRule = new SharedCountersRule();
 
   @Rule
-  public SharedErrorCollector errorCollector = new SharedErrorCollector();
+  public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
 
   @Before
   public void setUp() {

diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java
@@ -116,8 +116,8 @@
 import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.dunit.Wait;
 import org.apache.geode.test.dunit.internal.DUnitLauncher;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
 import org.apache.geode.test.dunit.rules.DistributedRule;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
 import org.apache.geode.test.junit.categories.MembershipTest;
 
 /**
@@ -151,7 +151,7 @@ public class LocatorDUnitTest implements Serializable {
   public DistributedRule distributedRule = new DistributedRule(6);
 
   @Rule
-  public SharedErrorCollector errorCollector = new SharedErrorCollector();
+  public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
 
   @Before
   public void setUp() {

diff --git a/...dTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerDUnitTest.java b/...dTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerDUnitTest.java
@@ -77,8 +77,8 @@
 import org.apache.geode.test.dunit.SerializableRunnable;
 import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.dunit.cache.CacheTestCase;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
 import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
 import org.apache.geode.test.junit.categories.MembershipTest;
 
 /**
@@ -102,7 +102,7 @@ public class ClusterDistributionManagerDUnitTest extends CacheTestCase {
       new DistributedRestoreSystemProperties();
 
   @Rule
-  public SharedErrorCollector errorCollector = new SharedErrorCollector();
+  public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
   private int locatorPort;
 
   @Before

diff --git a/...tributedTest/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java b/...tributedTest/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java
@@ -42,7 +42,7 @@
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.test.dunit.DistributedTestCase;
 import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
 import org.apache.geode.test.junit.categories.MembershipTest;
 import org.apache.geode.test.junit.rules.ExecutorServiceRule;
 
@@ -57,7 +57,7 @@ public class DistributionAdvisorDUnitTest extends DistributedTestCase {
   public ExecutorServiceRule executorServiceRule = new ExecutorServiceRule();
 
   @Rule
-  public SharedErrorCollector errorCollector = new SharedErrorCollector();
+  public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
 
   @Before
   public void setUp() {

diff --git a/...stributedTest/java/org/apache/geode/internal/cache/BucketCreationCrashRegressionTest.java b/...stributedTest/java/org/apache/geode/internal/cache/BucketCreationCrashRegressionTest.java
@@ -57,8 +57,8 @@
 import org.apache.geode.test.dunit.SerializableRunnableIF;
 import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.dunit.rules.CacheRule;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
 import org.apache.geode.test.dunit.rules.DistributedRule;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
 import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
 import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
 
@@ -93,7 +93,7 @@ public class BucketCreationCrashRegressionTest implements Serializable {
   public SerializableTestName testName = new SerializableTestName();
 
   @Rule
-  public SharedErrorCollector errorCollector = new SharedErrorCollector();
+  public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
 
   @Before
   public void setUp() throws Exception {

diff --git a/...e/src/distributedTest/java/org/apache/geode/internal/cache/DeltaPropagationDUnitTest.java b/...e/src/distributedTest/java/org/apache/geode/internal/cache/DeltaPropagationDUnitTest.java
@@ -101,9 +101,9 @@
 import org.apache.geode.internal.statistics.StatisticsClock;
 import org.apache.geode.internal.tcp.ConnectionTable;
 import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
 import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
 import org.apache.geode.test.dunit.rules.DistributedRule;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
 import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
 import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
 
@@ -152,7 +152,7 @@ public class DeltaPropagationDUnitTest implements Serializable {
   @Rule
   public SerializableTestName testName = new SerializableTestName();
   @Rule
-  public SharedErrorCollector errorCollector = new SharedErrorCollector();
+  public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
 
   @Before
   public void setUp() {
@@ -1486,9 +1486,9 @@ public void afterUpdate(EntryEvent event) {
 
   private static class ValidatingClientListener extends CacheListenerAdapter<String, Object> {
 
-    private final SharedErrorCollector errorCollector;
+    private final DistributedErrorCollector errorCollector;
 
-    private ValidatingClientListener(SharedErrorCollector errorCollector) {
+    private ValidatingClientListener(DistributedErrorCollector errorCollector) {
       this.errorCollector = errorCollector;
     }
 
@@ -1511,9 +1511,9 @@ public void afterUpdate(EntryEvent event) {
 
   private static class SkipThirdDeltaValue extends ValidatingClientListener {
 
-    private final SharedErrorCollector errorCollector;
+    private final DistributedErrorCollector errorCollector;
 
-    private SkipThirdDeltaValue(SharedErrorCollector errorCollector) {
+    private SkipThirdDeltaValue(DistributedErrorCollector errorCollector) {
       super(errorCollector);
       this.errorCollector = errorCollector;
     }
@@ -1562,9 +1562,9 @@ public void afterCreate(EntryEvent event) {
 
   private static class DurableClientListener extends CacheListenerAdapter<String, Object> {
 
-    private final SharedErrorCollector errorCollector;
+    private final DistributedErrorCollector errorCollector;
 
-    private DurableClientListener(SharedErrorCollector errorCollector) {
+    private DurableClientListener(DistributedErrorCollector errorCollector) {
       this.errorCollector = errorCollector;
     }
 

diff --git a/...est/java/org/apache/geode/internal/cache/PRQueryWithPdxDuringRebalanceRegressionTest.java b/...est/java/org/apache/geode/internal/cache/PRQueryWithPdxDuringRebalanceRegressionTest.java
@@ -45,8 +45,8 @@
 import org.apache.geode.internal.cache.partitioned.QueryMessage;
 import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.dunit.rules.CacheRule;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
 import org.apache.geode.test.dunit.rules.DistributedRule;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
 
@@ -79,7 +79,7 @@ public class PRQueryWithPdxDuringRebalanceRegressionTest implements Serializable
   public SerializableTestName testName = new SerializableTestName();
 
   @Rule
-  public SharedErrorCollector errorCollector = new SharedErrorCollector();
+  public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
 
   @Before
   public void setUp() {

diff --git a/...Test/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java b/...Test/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
@@ -83,8 +83,8 @@
 import org.apache.geode.test.dunit.LogWriterUtils;
 import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
 import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
 import org.apache.geode.test.junit.categories.PersistenceTest;
 
 @Category(PersistenceTest.class)
@@ -100,7 +100,7 @@ public class PersistentRVVRecoveryDUnitTest extends PersistentReplicatedTestBase
       new DistributedRestoreSystemProperties();
 
   @Rule
-  public SharedErrorCollector errorCollector = new SharedErrorCollector();
+  public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
 
   @After
   public void tearDown() {

diff --git a/...tributedTest/java/org/apache/geode/management/DistributedSystemMXBeanDistributedTest.java b/...tributedTest/java/org/apache/geode/management/DistributedSystemMXBeanDistributedTest.java
@@ -44,8 +44,8 @@
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.management.internal.SystemManagementService;
 import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
 import org.apache.geode.test.dunit.rules.DistributedRule;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
 import org.apache.geode.test.junit.categories.ManagementTest;
 
 /**
@@ -79,7 +79,7 @@ public class DistributedSystemMXBeanDistributedTest implements Serializable {
   public DistributedRule distributedRule = new DistributedRule();
 
   @Rule
-  public SharedErrorCollector errorCollector = new SharedErrorCollector();
+  public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
 
   @Before
   public void setUp() throws Exception {

diff --git a/...st/java/org/apache/geode/management/DistributedSystemMXBeanWithAlertsDistributedTest.java b/...st/java/org/apache/geode/management/DistributedSystemMXBeanWithAlertsDistributedTest.java
@@ -70,8 +70,8 @@
 import org.apache.geode.logging.internal.log4j.api.LogService;
 import org.apache.geode.test.dunit.IgnoredException;
 import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
 import org.apache.geode.test.dunit.rules.DistributedRule;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
 import org.apache.geode.test.junit.categories.AlertingTest;
 import org.apache.geode.test.junit.categories.ManagementTest;
 import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
@@ -119,7 +119,7 @@ public class DistributedSystemMXBeanWithAlertsDistributedTest implements Seriali
   public SerializableTestName testName = new SerializableTestName();
 
   @Rule
-  public SharedErrorCollector errorCollector = new SharedErrorCollector();
+  public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
 
   @Before
   public void setUp() throws Exception {

diff --git a/.../org/apache/geode/management/DistributedSystemMXBeanWithNotificationsDistributedTest.java b/.../org/apache/geode/management/DistributedSystemMXBeanWithNotificationsDistributedTest.java
@@ -61,8 +61,8 @@
 import org.apache.geode.management.internal.beans.MemberMBean;
 import org.apache.geode.management.internal.beans.SequenceNumber;
 import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
 import org.apache.geode.test.dunit.rules.DistributedRule;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
 import org.apache.geode.test.junit.categories.ManagementTest;
 
 /**
@@ -114,7 +114,7 @@ public class DistributedSystemMXBeanWithNotificationsDistributedTest implements
   public DistributedRule distributedRule = new DistributedRule();
 
   @Rule
-  public SharedErrorCollector errorCollector = new SharedErrorCollector();
+  public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
 
   @Before
   public void setUp() throws Exception {

diff --git a/...core/src/distributedTest/java/org/apache/geode/management/JMXMBeanReconnectDUnitTest.java b/...core/src/distributedTest/java/org/apache/geode/management/JMXMBeanReconnectDUnitTest.java
@@ -72,8 +72,8 @@
 import org.apache.geode.distributed.internal.membership.api.MemberDisconnectedException;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
 import org.apache.geode.test.dunit.rules.DistributedRule;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
 import org.apache.geode.test.junit.categories.JMXTest;
 import org.apache.geode.test.junit.rules.GfshCommandRule;
 import org.apache.geode.test.junit.rules.GfshCommandRule.PortType;
@@ -119,7 +119,7 @@ public class JMXMBeanReconnectDUnitTest implements Serializable {
   @Rule
   public SerializableTemporaryFolder temporaryFolder = new SerializableTemporaryFolder();
   @Rule
-  public SharedErrorCollector errorCollector = new SharedErrorCollector();
+  public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
   @Rule
   public transient GfshCommandRule gfsh = new GfshCommandRule();
 

diff --git a/...ava/org/apache/geode/management/internal/MBeanFederationErrorHandlingDistributedTest.java b/...ava/org/apache/geode/management/internal/MBeanFederationErrorHandlingDistributedTest.java
@@ -54,9 +54,9 @@
 import org.apache.geode.internal.statistics.StatisticsClock;
 import org.apache.geode.management.ManagementService;
 import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
 import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
 import org.apache.geode.test.dunit.rules.DistributedRule;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
 import org.apache.geode.test.junit.categories.JMXTest;
 import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
 
@@ -80,7 +80,7 @@ public class MBeanFederationErrorHandlingDistributedTest implements Serializable
   public DistributedRule distributedRule = new DistributedRule();
 
   @Rule
-  public SharedErrorCollector errorCollector = new SharedErrorCollector();
+  public DistributedErrorCollector errorCollector = new DistributedErrorCollector();
 
   @Rule
   public DistributedRestoreSystemProperties restoreSystemProperties =