Merge pull request #217 from rjeberhard/exec-finalreview

Minor cleanups to Exec

Author: brendandburns

util/src/main/java/io/kubernetes/client/Exec.java

@@ -12,6 +12,8 @@
 */
 package io.kubernetes.client;
 
+import static io.kubernetes.client.KubernetesConstants.*;
+
 import com.google.common.io.CharStreams;
 import com.google.gson.reflect.TypeToken;
 import io.kubernetes.client.models.V1Pod;
@@ -202,15 +204,15 @@ static int parseExitCode(ApiClient client, InputStream inputStream) {
       }
 
       V1Status status = client.getJSON().deserialize(body, returnType);
-      if ("Success".equals(status.getStatus())) return 0;
+      if (V1STATUS_SUCCESS.equals(status.getStatus())) return 0;
 
-      if ("NonZeroExitCode".equals(status.getReason())) {
+      if (V1STATUS_REASON_NONZEROEXITCODE.equals(status.getReason())) {
         V1StatusDetails details = status.getDetails();
         if (details != null) {
           List<V1StatusCause> causes = details.getCauses();
           if (causes != null) {
             for (V1StatusCause cause : causes) {
-              if ("ExitCode".equals(cause.getReason())) {
+              if (V1STATUS_CAUSE_REASON_EXITCODE.equals(cause.getReason())) {
                 try {
                   return Integer.parseInt(cause.getMessage());
                 } catch (NumberFormatException nfe) {
@@ -239,7 +241,7 @@ public ExecProcess() throws IOException {
       this.streamHandler =
           new WebSocketStreamHandler() {
             @Override
-            protected void handleMessage(int stream, InputStream inStream) {
+            protected void handleMessage(int stream, InputStream inStream) throws IOException {
               if (stream == 3) {
                 int exitCode = parseExitCode(apiClient, inStream);
                 if (exitCode >= 0) {

util/src/main/java/io/kubernetes/client/KubernetesConstants.java

@@ -0,0 +1,27 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package io.kubernetes.client;
+
+public final class KubernetesConstants {
+  private KubernetesConstants() {}
+
+  // V1Status values
+  public static final String V1STATUS_SUCCESS = "Success";
+  public static final String V1STATUS_FAILURE = "Failure";
+
+  // V1Status reason values
+  public static final String V1STATUS_REASON_NONZEROEXITCODE = "NonZeroExitCode";
+
+  // V1Status cause reason values
+  public static final String V1STATUS_CAUSE_REASON_EXITCODE = "ExitCode";
+}

util/src/main/java/io/kubernetes/client/util/WebSocketStreamHandler.java

@@ -83,13 +83,9 @@ public void textMessage(Reader in) {
     }
   }
 
-  protected void handleMessage(int stream, InputStream inStream) {
-    try {
-      OutputStream out = getSocketInputOutputStream(stream);
-      ByteStreams.copy(inStream, out);
-    } catch (IOException ex) {
-      log.error("Error handling message", ex);
-    }
+  protected void handleMessage(int stream, InputStream inStream) throws IOException {
+    OutputStream out = getSocketInputOutputStream(stream);
+    ByteStreams.copy(inStream, out);
   }
 
   @Override