WlsRetriever disallow null service in constructor

Author: alai8

operator/src/main/java/oracle/kubernetes/operator/wlsconfig/WlsRetriever.java

@@ -244,6 +244,9 @@ static final class WithHttpClientStep extends Step {
     public WithHttpClientStep(RequestType requestType, V1Service service, Step next) {
       super(next);
       this.requestType = requestType;
+      if (service == null) {
+        throw new IllegalArgumentException("service cannot be null");
+      }
       this.service = service;
     }
 
@@ -359,18 +362,19 @@ public NextAction apply(Packet packet) {
 
         return doNext(packet);
       } catch (Throwable t) {
+        // do not retry for health check
+        if (RequestType.HEALTH.equals(requestType)) {
+          LOGGER.fine(
+              MessageKeys.WLS_HEALTH_READ_FAILED, packet.get(ProcessingConstants.SERVER_NAME), t);
+          return doNext(packet);
+        }
         // exponential back-off
         Integer retryCount = (Integer) packet.get(RETRY_COUNT);
         if (retryCount == null) {
           retryCount = 0;
           // Log warning if this is the first try. Do not log for retries to prevent
           // filling up the log repeatedly  with same log message
-          if (RequestType.CONFIG.equals(requestType)) {
-            LOGGER.warning(MessageKeys.WLS_CONFIGURATION_READ_FAILED, t);
-          } else {
-            LOGGER.fine(
-                MessageKeys.WLS_HEALTH_READ_FAILED, packet.get(ProcessingConstants.SERVER_NAME), t);
-          }
+          LOGGER.warning(MessageKeys.WLS_CONFIGURATION_READ_FAILED, t);
         }
         long waitTime = Math.min((2 << ++retryCount) * SCALE, MAX) + (R.nextInt(HIGH - LOW) + LOW);
         packet.put(RETRY_COUNT, retryCount);

operator/src/test/java/oracle/kubernetes/operator/wlsconfig/WlsRetrieverTest.java

@@ -92,7 +92,7 @@ public void withHttpClientStep_Health_logIfFailed() {
     assertThat(logRecords, containsFine(WLS_HEALTH_READ_FAILED, SERVER_NAME));
   }
 
-  @Test
+  // @Test - no longer retry for Health check
   public void withHttpClientStep_Health_nologIfFailedOnRetry() {
     V1Service service = Stub.createStub(V1ServiceStub.class);
     Step next = new MockStep(null);