Respond to comments.

brendandburns · brendandburns · commit 3988b5cee3ac · 2020-08-06T16:46:25.000-07:00
diff --git a/examples/src/main/java/io/kubernetes/client/examples/KubectlExample.java b/examples/src/main/java/io/kubernetes/client/examples/KubectlExample.java
@@ -21,7 +21,6 @@
 import com.google.common.io.ByteStreams;
 import io.kubernetes.client.common.KubernetesObject;
 import io.kubernetes.client.extended.kubectl.KubectlExec;
-import io.kubernetes.client.extended.kubectl.KubectlLog;
 import io.kubernetes.client.extended.kubectl.exception.KubectlException;
 import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.openapi.models.V1Deployment;
@@ -87,9 +86,9 @@ public static void main(String[] args)
     switch (verb) {
       case "log":
         name = args[1];
-        KubectlLog log = log();
-        log.name(name).namespace(ns).container(cli.getOptionValue("c", "")).execute();
-        ByteStreams.copy(log.stream(), System.out);
+        ByteStreams.copy(
+            log().name(name).namespace(ns).container(cli.getOptionValue("c", "")).execute(),
+            System.out);
         System.exit(0);
       case "scale":
         kind = args[1];
diff --git a/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlLog.java b/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlLog.java
@@ -12,48 +12,47 @@
 */
 package io.kubernetes.client.extended.kubectl;
 
+import static com.google.common.base.Strings.isNullOrEmpty;
+
 import io.kubernetes.client.PodLogs;
 import io.kubernetes.client.extended.kubectl.exception.KubectlException;
 import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.openapi.ApiException;
-import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import io.kubernetes.client.openapi.models.V1Pod;
 import java.io.IOException;
 import java.io.InputStream;
 
 public class KubectlLog extends Kubectl.ResourceAndContainerBuilder<V1Pod, KubectlLog>
-    implements Kubectl.Executable<V1Pod> {
+    implements Kubectl.Executable<InputStream> {
   private InputStream result;
 
   KubectlLog(ApiClient client) {
     super(client, V1Pod.class);
   }
 
-  public InputStream stream() {
-    return result;
-  }
-
   @Override
-  public V1Pod execute() throws KubectlException {
+  public InputStream execute() throws KubectlException {
     validate();
-    V1Pod pod = new V1Pod().metadata(new V1ObjectMeta().name(name).namespace(namespace));
 
     PodLogs logs = new PodLogs(apiClient);
     String ns = (this.namespace == null ? "default" : this.namespace);
     try {
-      result = logs.streamNamespacedPodLog(this.name, ns, this.container);
+      return logs.streamNamespacedPodLog(this.name, ns, this.container);
     } catch (ApiException | IOException ex) {
       throw new KubectlException(ex);
     }
-    return pod;
   }
 
   private void validate() throws KubectlException {
-    if (name == null || name.length() == 0) {
-      throw new KubectlException("missing name!");
+    StringBuilder msg = new StringBuilder();
+    if (isNullOrEmpty(name)) {
+      msg.append("missing name! ");
+    }
+    if (isNullOrEmpty(container)) {
+      msg.append("missing container!");
     }
-    if (container == null || name.length() == 0) {
-      throw new KubectlException("missing container!");
+    if (msg.length() > 0) {
+      throw new KubectlException(msg.toString());
     }
   }
 }
