fix #4924: addressing code smells

Author: shawkins

junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesCrudDispatcher.java

@@ -210,11 +210,13 @@ private void processDelete(String path, AttributeSet pathAttributes, AttributeSe
       // No finalizers left, actually remove the resource.
       processEvent(path, pathAttributes, oldAttributes, null, null);
       return;
-    } else if (!resource.isMarkedForDeletion()) {
+    }
+    if (!resource.isMarkedForDeletion()) {
       // Mark the resource as deleted, but don't remove it yet (wait for finalizer-removal).
       resource.getMetadata().setDeletionTimestamp(LocalDateTime.now().toString());
       String updatedResource = Serialization.asJson(resource);
       processEvent(path, pathAttributes, oldAttributes, resource, updatedResource);
+      return;
     }
     // else: if the resource is already marked for deletion and still has finalizers, do nothing.
   }
@@ -290,11 +292,9 @@ public MockResponse handleWatch(String path) {
       query = query.add(new Attribute("name", resourceName));
     }
     WatchEventsListener watchEventListener = new WatchEventsListener(context, query, watchEventListeners, LOGGER,
-        watch -> {
-          map.entrySet().stream()
-              .filter(entry -> watch.attributeMatches(entry.getKey()))
-              .forEach(entry -> watch.sendWebSocketResponse(entry.getValue(), Action.ADDED));
-        });
+        watch -> map.entrySet().stream()
+            .filter(entry -> watch.attributeMatches(entry.getKey()))
+            .forEach(entry -> watch.sendWebSocketResponse(entry.getValue(), Action.ADDED)));
     watchEventListeners.add(watchEventListener);
     mockResponse.setSocketPolicy(SocketPolicy.KEEP_OPEN);
     return mockResponse.withWebSocketUpgrade(watchEventListener);

kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/utils/Serialization.java

@@ -228,43 +228,52 @@ private static <T> T unmarshal(InputStream is, ObjectMapper mapper, TypeReferenc
       } while (intch > -1 && Character.isWhitespace(intch));
       bis.reset();
 
-      T result = null;
-      List<KubernetesResource> listResult = null;
+      final T result;
       if (intch != '{' && intch != '[') {
-        final Load yaml = new Load(LoadSettings.builder().build());
-        // if multiple docs exist, only non-null resources will be kept
-        final Iterable<Object> objs = yaml.loadAllFromInputStream(bis);
-        for (Object obj : objs) {
-          Object value = null;
-          if (obj instanceof Map) {
-            value = mapper.convertValue(obj, type);
-          } else if (obj != null) {
-            value = mapper.convertValue(new RawExtension(obj), type);
-          }
-          if (value != null) {
-            if (result == null) {
-              result = (T) value;
-            } else {
-              if (listResult == null) {
-                listResult = new ArrayList<>();
-                accumulateResult(result, listResult);
-              }
-              accumulateResult(value, listResult);
-            }
-          }
-        }
+        result = parseYaml(bis, mapper, type);
       } else {
         result = mapper.readerFor(type).readValue(bis);
       }
-      if (listResult != null) {
-        return (T) listResult;
-      }
       return result;
     } catch (IOException e) {
       throw KubernetesClientException.launderThrowable(e);
     }
   }
 
+  /**
+   * If multiple docs exist, only non-null resources will be kept. Results spanning multiple docs
+   * will be returned as a List of KubernetesResource
+   */
+  private static <T> T parseYaml(BufferedInputStream bis, ObjectMapper mapper, TypeReference<T> type) {
+    T result = null;
+    List<KubernetesResource> listResult = null;
+    final Load yaml = new Load(LoadSettings.builder().build());
+    final Iterable<Object> objs = yaml.loadAllFromInputStream(bis);
+    for (Object obj : objs) {
+      Object value = null;
+      if (obj instanceof Map) {
+        value = mapper.convertValue(obj, type);
+      } else if (obj != null) {
+        value = mapper.convertValue(new RawExtension(obj), type);
+      }
+      if (value != null) {
+        if (result == null) {
+          result = (T) value;
+        } else {
+          if (listResult == null) {
+            listResult = new ArrayList<>();
+            accumulateResult(result, listResult);
+          }
+          accumulateResult(value, listResult);
+        }
+      }
+    }
+    if (listResult != null) {
+      return (T) listResult;
+    }
+    return result;
+  }
+
   private static <T> void accumulateResult(T result, List<KubernetesResource> listResult) {
     if (result instanceof KubernetesResourceList) {
       listResult.addAll(((KubernetesResourceList) result).getItems());