Intermittent status fix

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainStatus.java

@@ -314,6 +314,9 @@ public void setServers(List<ServerStatus> servers) {
   private ServerStatus adjust(ServerStatus server) {
     if (server.getState() == null) {
       ServerStatus oldServer = getMatchingServer(server);
+      if ((oldServer != null) && (oldServer.getHealth() == null)) {
+        return server;
+      }
       server.setState(oldServer == null ? SHUTDOWN_STATE : oldServer.getState());
     }
     return server;

operator/src/main/java/oracle/kubernetes/weblogic/domain/model/ServerStatus.java

@@ -208,7 +208,7 @@ public ServerStatus withNodeName(String nodeName) {
    *
    * @return health
    */
-  private ServerHealth getHealth() {
+  ServerHealth getHealth() {
     return health;
   }
 

operator/src/test/java/oracle/kubernetes/weblogic/domain/model/DomainStatusTest.java

@@ -319,14 +319,17 @@ public void whenSetServerIncludesServerWithoutStateAndNoExistingState_defaultToS
 
   @Test
   public void whenSetServerIncludesServerWithoutStateAndHasExistingState_preserveIt() {
-    domainStatus.addServer(new ServerStatus().withClusterName("1").withServerName("1").withState("state1"));
-    domainStatus.addServer(new ServerStatus().withClusterName("1").withServerName("2").withState("state1"));
-    domainStatus.addServer(new ServerStatus().withClusterName("1").withServerName("3").withState("state1"));
+    domainStatus.addServer(new ServerStatus().withClusterName("1").withServerName("1").withState("state1")
+        .withHealth(new ServerHealth().withOverallHealth("ok")));
+    domainStatus.addServer(new ServerStatus().withClusterName("1").withServerName("2").withState("state1")
+        .withHealth(new ServerHealth().withOverallHealth("ok")));
+    domainStatus.addServer(new ServerStatus().withClusterName("1").withServerName("3").withState("state1")
+        .withHealth(new ServerHealth().withOverallHealth("ok")));
 
     domainStatus.setServers(Arrays.asList(
-          new ServerStatus().withClusterName("1").withServerName("1").withState("state1"),
-          new ServerStatus().withClusterName("1").withServerName("2").withState("state1"),
-          new ServerStatus().withClusterName("1").withServerName("3")
+        new ServerStatus().withClusterName("1").withServerName("1").withState("state1"),
+        new ServerStatus().withClusterName("1").withServerName("2").withState("state1"),
+        new ServerStatus().withClusterName("1").withServerName("3")
     ));
 
     assertThat(getServer("1", "3").getState(), equalTo("state1"));