rename constant. add tests

Author: alai8

operator/src/main/java/oracle/kubernetes/operator/DomainProcessorImpl.java

@@ -316,7 +316,7 @@ public void run() {
                     @Override
                     public void onCompletion(Packet packet) {
                       AtomicInteger serverHealthRead =
-                          packet.getValue(ProcessingConstants.REMAINING_SERVERS_HEALTH_READ);
+                          packet.getValue(ProcessingConstants.REMAINING_SERVERS_HEALTH_TO_READ);
                       if (serverHealthRead == null || serverHealthRead.get() == 0) {
                         loggingFilter.setFiltering(false).resetLogHistory();
                       } else {

operator/src/main/java/oracle/kubernetes/operator/ProcessingConstants.java

@@ -32,5 +32,5 @@ public interface ProcessingConstants {
   public static final String DOMAIN_INTROSPECTOR_LOG_RESULT = "domainIntrospectorLogResult";
   public static final String SIT_CONFIG_MAP = "sitConfigMap";
 
-  public static final String REMAINING_SERVERS_HEALTH_READ = "serverHealthRead";
+  public static final String REMAINING_SERVERS_HEALTH_TO_READ = "serverHealthRead";
 }

operator/src/main/java/oracle/kubernetes/operator/ServerStatusReader.java

@@ -69,8 +69,8 @@ public NextAction apply(Packet packet) {
       packet.put(SERVER_STATE_MAP, new ConcurrentHashMap<String, String>());
       packet.put(SERVER_HEALTH_MAP, new ConcurrentHashMap<String, ServerHealth>());
 
-      AtomicInteger serverHealthRead = new AtomicInteger();
-      packet.put(ProcessingConstants.REMAINING_SERVERS_HEALTH_READ, serverHealthRead);
+      AtomicInteger remainingServerHealthToRead = new AtomicInteger();
+      packet.put(ProcessingConstants.REMAINING_SERVERS_HEALTH_TO_READ, remainingServerHealthToRead);
 
       Collection<StepAndPacket> startDetails =
           info.getServerPods()
@@ -80,7 +80,7 @@ public NextAction apply(Packet packet) {
       if (startDetails.isEmpty()) {
         return doNext(packet);
       } else {
-        serverHealthRead.set(startDetails.size());
+        remainingServerHealthToRead.set(startDetails.size());
         return doForkJoin(getNext(), packet, startDetails);
       }
     }

operator/src/main/java/oracle/kubernetes/operator/steps/ReadHealthStep.java

@@ -154,9 +154,9 @@ public NextAction apply(Packet packet) {
                 (ConcurrentMap<String, ServerHealth>)
                     packet.get(ProcessingConstants.SERVER_HEALTH_MAP);
             serverHealthMap.put((String) packet.get(ProcessingConstants.SERVER_NAME), health);
-            AtomicInteger serverHealthRead =
-                packet.getValue(ProcessingConstants.REMAINING_SERVERS_HEALTH_READ);
-            serverHealthRead.getAndDecrement();
+            AtomicInteger remainingServersHealthToRead =
+                packet.getValue(ProcessingConstants.REMAINING_SERVERS_HEALTH_TO_READ);
+            remainingServersHealthToRead.getAndDecrement();
           }
         }
         return doNext(packet);

operator/src/test/java/oracle/kubernetes/operator/ServerStatusReaderTest.java

@@ -9,6 +9,7 @@
 import static oracle.kubernetes.operator.ProcessingConstants.SERVER_STATE_MAP;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.hasEntry;
+import static org.hamcrest.Matchers.is;
 import static org.hamcrest.junit.MatcherAssert.assertThat;
 
 import com.meterware.pseudoserver.HttpUserAgentTest;
@@ -27,6 +28,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 import oracle.kubernetes.TestUtils;
 import oracle.kubernetes.operator.helpers.DomainPresenceInfo;
@@ -119,6 +121,19 @@ public void whenServerPodsReturnNodeManagerStatus_recordInStateMap() {
     assertThat(serverStates, hasEntry("server2", "server2 status"));
   }
 
+  @Test
+  public void createDomainStatusReaderStep_initializesRemainingServersHealthRead_withNumServers() {
+    info.setServerPod("server1", createPod("server1"));
+    info.setServerPod("server2", createPod("server2"));
+
+    Packet packet =
+        testSupport.runSteps(ServerStatusReader.createDomainStatusReaderStep(info, 0, endStep));
+
+    assertThat(
+        ((AtomicInteger) packet.get(ProcessingConstants.REMAINING_SERVERS_HEALTH_TO_READ)).get(),
+        is(2));
+  }
+
   @SuppressWarnings("unchecked")
   private Map<String, String> getServerStates(Packet packet) {
     return (Map<String, String>) packet.get(SERVER_STATE_MAP);

operator/src/test/java/oracle/kubernetes/operator/steps/ReadHealthStepTest.java

@@ -95,15 +95,15 @@ public void withHttpClientStep_logIfMissingHTTPClient() {
     final String SERVER_NAME = ADMIN_NAME;
     Packet packet =
         Stub.createStub(PacketStub.class).withServerName(SERVER_NAME).withGetKeyReturnValue(null);
-    packet.put(ProcessingConstants.REMAINING_SERVERS_HEALTH_READ, new AtomicInteger(1));
+    packet.put(ProcessingConstants.REMAINING_SERVERS_HEALTH_TO_READ, new AtomicInteger(1));
 
     ReadHealthWithHttpClientStep withHttpClientStep =
         new ReadHealthWithHttpClientStep(service, null, next);
     withHttpClientStep.apply(packet);
 
     assertThat(logRecords, containsInfo(WLS_HEALTH_READ_FAILED_NO_HTTPCLIENT, SERVER_NAME));
     assertThat(
-        ((AtomicInteger) packet.get(ProcessingConstants.REMAINING_SERVERS_HEALTH_READ)).get(),
+        ((AtomicInteger) packet.get(ProcessingConstants.REMAINING_SERVERS_HEALTH_TO_READ)).get(),
         is(1));
   }
 
@@ -121,14 +121,14 @@ public void withHttpClientStep_decrementRemainingServerHealthReadInPacketIfSucce
             .withGetKeyReturnValue(httpClientStub);
     packet.put(
         ProcessingConstants.SERVER_HEALTH_MAP, new ConcurrentHashMap<String, ServerHealth>());
-    packet.put(ProcessingConstants.REMAINING_SERVERS_HEALTH_READ, new AtomicInteger(1));
+    packet.put(ProcessingConstants.REMAINING_SERVERS_HEALTH_TO_READ, new AtomicInteger(1));
 
     ReadHealthWithHttpClientStep withHttpClientStep =
         new ReadHealthWithHttpClientStep(service, null, next);
     withHttpClientStep.apply(packet);
 
     assertThat(
-        ((AtomicInteger) packet.get(ProcessingConstants.REMAINING_SERVERS_HEALTH_READ)).get(),
+        ((AtomicInteger) packet.get(ProcessingConstants.REMAINING_SERVERS_HEALTH_TO_READ)).get(),
         is(0));
   }
 
@@ -144,7 +144,7 @@ public void withHttpClientStep_decrementRemainingServerHealthReadInMultipleClone
     packet.put(HttpClient.KEY, httpClientStub);
     packet.put(
         ProcessingConstants.SERVER_HEALTH_MAP, new ConcurrentHashMap<String, ServerHealth>());
-    packet.put(ProcessingConstants.REMAINING_SERVERS_HEALTH_READ, new AtomicInteger(2));
+    packet.put(ProcessingConstants.REMAINING_SERVERS_HEALTH_TO_READ, new AtomicInteger(2));
 
     ReadHealthWithHttpClientStep withHttpClientStep1 =
         new ReadHealthWithHttpClientStep(service, null, next);
@@ -160,7 +160,7 @@ public void withHttpClientStep_decrementRemainingServerHealthReadInMultipleClone
     withHttpClientStep2.apply(packet2);
 
     assertThat(
-        ((AtomicInteger) packet.get(ProcessingConstants.REMAINING_SERVERS_HEALTH_READ)).get(),
+        ((AtomicInteger) packet.get(ProcessingConstants.REMAINING_SERVERS_HEALTH_TO_READ)).get(),
         is(0));
   }