Review comments

Author: rjeberhard

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

@@ -193,19 +193,25 @@ private void handleErrorResponse(Watch.Response<T> item) {
       // not available to our layer, so respond defensively by resetting resource version.
       resourceVersion = 0l;
     } else if (status.getCode() == HTTP_GONE) {
-      resourceVersion = 0l;
-      String message = status.getMessage();
+      resourceVersion = computeNextResourceVersionFromMessage(status);
+    }
+  }
+
+  private long computeNextResourceVersionFromMessage(V1Status status) {
+    String message = status.getMessage();
+    if (message != null) {
       int index1 = message.indexOf('(');
       if (index1 > 0) {
         int index2 = message.indexOf(')', index1 + 1);
         if (index2 > 0) {
           String val = message.substring(index1 + 1, index2);
           if (!isNullOrEmptyString(val)) {
-            resourceVersion = Long.parseLong(val);
+            return Long.parseLong(val);
           }
         }
       }
     }
+    return 0l;
   }
 
   /**

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

@@ -146,48 +146,36 @@ public void afterFirstSetOfEvents_nextRequestSendsLastResourceVersion() {
   @SuppressWarnings({"unchecked", "rawtypes"})
   @Test
   public void afterHttpGoneError_nextRequestSendsIncludedResourceVersion() {
-    try {
-      StubWatchFactory.addCallResponses(createHttpGoneErrorResponse(NEXT_RESOURCE_VERSION));
-      scheduleDeleteResponse(createObjectWithMetaData());
+    StubWatchFactory.addCallResponses(createHttpGoneErrorResponse(NEXT_RESOURCE_VERSION));
+    scheduleDeleteResponse(createObjectWithMetaData());
 
-      createAndRunWatcher(NAMESPACE, stopping, INITIAL_RESOURCE_VERSION);
+    createAndRunWatcher(NAMESPACE, stopping, INITIAL_RESOURCE_VERSION);
 
-      assertThat(
-          StubWatchFactory.getRequestParameters().get(1),
-          hasEntry("resourceVersion", Integer.toString(NEXT_RESOURCE_VERSION)));
-    } catch (Throwable t) {
-      t.printStackTrace();
-    }
+    assertThat(
+        StubWatchFactory.getRequestParameters().get(1),
+        hasEntry("resourceVersion", Integer.toString(NEXT_RESOURCE_VERSION)));
   }
 
   @SuppressWarnings({"unchecked", "rawtypes"})
   @Test
   public void afterHttpGoneErrorWithoutResourceVersion_nextRequestSendsResourceVersionZero() {
-    try {
-      StubWatchFactory.addCallResponses(createHttpGoneErrorWithoutResourceVersionResponse());
-      scheduleDeleteResponse(createObjectWithMetaData());
+    StubWatchFactory.addCallResponses(createHttpGoneErrorWithoutResourceVersionResponse());
+    scheduleDeleteResponse(createObjectWithMetaData());
 
-      createAndRunWatcher(NAMESPACE, stopping, INITIAL_RESOURCE_VERSION);
+    createAndRunWatcher(NAMESPACE, stopping, INITIAL_RESOURCE_VERSION);
 
-      assertThat(StubWatchFactory.getRequestParameters().get(1), hasEntry("resourceVersion", "0"));
-    } catch (Throwable t) {
-      t.printStackTrace();
-    }
+    assertThat(StubWatchFactory.getRequestParameters().get(1), hasEntry("resourceVersion", "0"));
   }
 
   @SuppressWarnings({"unchecked", "rawtypes"})
   @Test
   public void afterErrorWithoutStatus_nextRequestSendsResourceVersionZero() {
-    try {
-      StubWatchFactory.addCallResponses(createErrorWithoutStatusResponse());
-      scheduleDeleteResponse(createObjectWithMetaData());
+    StubWatchFactory.addCallResponses(createErrorWithoutStatusResponse());
+    scheduleDeleteResponse(createObjectWithMetaData());
 
-      createAndRunWatcher(NAMESPACE, stopping, INITIAL_RESOURCE_VERSION);
+    createAndRunWatcher(NAMESPACE, stopping, INITIAL_RESOURCE_VERSION);
 
-      assertThat(StubWatchFactory.getRequestParameters().get(1), hasEntry("resourceVersion", "0"));
-    } catch (Throwable t) {
-      t.printStackTrace();
-    }
+    assertThat(StubWatchFactory.getRequestParameters().get(1), hasEntry("resourceVersion", "0"));
   }
 
   @SuppressWarnings({"unchecked", "rawtypes"})