mhansonp commented on code in PR #7442:
URL: https://github.com/apache/geode/pull/7442#discussion_r842185352


##########
geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java:
##########
@@ -409,59 +369,50 @@ public void run2() throws CacheException {
   public void testDurableClientWithRegistrationHA() {
 
     // Step 1: Start server1
-    PORT1 = server1VM
-        .invoke(() -> CacheServerTestUtil.createCacheServer(regionName, 
Boolean.TRUE));
+    PORT1 = server1VM.invoke(() -> createCacheServer(regionName, 
Boolean.TRUE));
     PORT2 = getRandomAvailableTCPPort();
 
     // Step 2: Bring Up the Client
     final String durableClientId = getName() + "_client";
     // keep the client alive for 600 seconds
     final int durableClientTimeout = 600;
-    durableClientVM.invoke(() -> CacheServerTestUtil.createCacheClient(
-        
getClientPool(NetworkUtils.getServerHostName(durableClientVM.getHost()), PORT1, 
PORT2, true,
+    durableClientVM.invoke(() -> createCacheClient(
+        getClientPool(hostName, PORT1, PORT2, true,
             1),
         regionName, getClientDistributedSystemProperties(durableClientId, 
durableClientTimeout)));
 
     // Send clientReady message
-    durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+    durableClientVM.invoke("Send clientReady", new CacheSerializableRunnable() 
{
       @Override
       public void run2() throws CacheException {
-        CacheServerTestUtil.getCache().readyForEvents();
+        getCache().readyForEvents();
       }
     });
 
     // Step 3: Client registers Interests
-    durableClientVM
-        .invoke(() -> DurableRegistrationDUnitTest.registerKey(K1, 
Boolean.FALSE));
-    durableClientVM
-        .invoke(() -> DurableRegistrationDUnitTest.registerKey(K2, 
Boolean.FALSE));
-    durableClientVM
-        .invoke(() -> DurableRegistrationDUnitTest.registerKey(K3, 
Boolean.TRUE));
-    durableClientVM
-        .invoke(() -> DurableRegistrationDUnitTest.registerKey(K4, 
Boolean.TRUE));
+    durableClientVM.invoke(() -> registerKey(K1, Boolean.FALSE));
+    durableClientVM.invoke(() -> registerKey(K2, Boolean.FALSE));
+    durableClientVM.invoke(() -> registerKey(K3, Boolean.TRUE));
+    durableClientVM.invoke(() -> registerKey(K4, Boolean.TRUE));
 
     // Step 4: Bring up the server2
-
-    server2VM
-        .invoke(() -> CacheServerTestUtil.createCacheServer(regionName, 
Boolean.TRUE, PORT2));
+    server2VM.invoke(() -> createCacheServer(regionName, Boolean.TRUE, PORT2));
 
     Wait.pause(3000);
 
     // Check server2 got all the interests registered by the durable client.
-    server2VM.invoke(new CacheSerializableRunnable("Verify Interests.") {
+    server2VM.invoke("Verify Interests.", new CacheSerializableRunnable() {
       @Override
       public void run2() throws CacheException {
-        LogWriterUtils.getLogWriter()
-            .info("### Verifying interests registered by DurableClient. ###");
+        logger.info("### Verifying interests registered by DurableClient. 
###");
         CacheClientNotifier ccn = CacheClientNotifier.getInstance();
         CacheClientProxy p = null;
 
         // Get proxy for the client.
         for (int i = 0; i < 60; i++) {
-          Iterator ps = ccn.getClientProxies().iterator();
+          Iterator<CacheClientProxy> ps = ccn.getClientProxies().iterator();

Review Comment:
   Pet peeve.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to