Merge pull request #46 from mbohlool/watch2

Move Watch to util package

Author: brendandburns

examples/src/main/java/io/kubernetes/client/examples/WatchExample.java

@@ -14,12 +14,12 @@
 
 import com.google.gson.reflect.TypeToken;
 import io.kubernetes.client.ApiClient;
-import io.kubernetes.client.Watch;
 import io.kubernetes.client.ApiException;
 import io.kubernetes.client.Configuration;
 import io.kubernetes.client.apis.CoreV1Api;
 import io.kubernetes.client.models.V1Namespace;
 import io.kubernetes.client.util.Config;
+import io.kubernetes.client.util.Watch;
 
 import java.io.IOException;
 
@@ -33,7 +33,8 @@ public static void main(String[] args) throws IOException, ApiException{
 
         CoreV1Api api = new CoreV1Api();
 
-        Watch<V1Namespace> watch = client.watch(
+        Watch<V1Namespace> watch = Watch.createWatch(
+                client,
                 api.listNamespaceCall(null, null, null, null, 5, Boolean.TRUE, null, null),
                 new TypeToken<Watch.Response<V1Namespace>>(){}.getType());
 

kubernetes/src/main/java/io/kubernetes/client/ApiClient.java

@@ -949,26 +949,6 @@ public File prepareDownloadFile(Response response) throws IOException {
             return File.createTempFile(prefix, suffix, new File(tempFolderPath));
     }
 
-    public <T> Watch<T> watch(Call call, Type watchType) throws ApiException {
-        try {
-            Response response = call.execute();
-            if (!response.isSuccessful()) {
-                String respBody = null;
-                if (response.body() != null) {
-                    try {
-                        respBody = response.body().string();
-                    } catch (IOException e) {
-                        throw new ApiException(response.message(), e, response.code(), response.headers().toMultimap());
-                    }
-                }
-                throw new ApiException(response.message(), response.code(), response.headers().toMultimap(), respBody);
-            }
-            return new Watch<>(this.json, response.body(), watchType);
-        } catch (IOException e) {
-            throw new ApiException(e);
-        }
-    }
-
     /**
      * {@link #execute(Call, Type)}
      *

…ain/java/io/kubernetes/client/Watch.java …ava/io/kubernetes/client/util/Watch.javakubernetes/src/main/java/io/kubernetes/client/Watch.java renamed to util/src/main/java/io/kubernetes/client/util/Watch.java kubernetes/src/main/java/io/kubernetes/client/Watch.java renamed to util/src/main/java/io/kubernetes/client/util/Watch.java

@@ -10,10 +10,14 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-package io.kubernetes.client;
+package io.kubernetes.client.util;
 
 import com.google.gson.annotations.SerializedName;
+import com.squareup.okhttp.Call;
 import com.squareup.okhttp.ResponseBody;
+import io.kubernetes.client.ApiClient;
+import io.kubernetes.client.ApiException;
+import io.kubernetes.client.JSON;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
@@ -51,7 +55,38 @@ public static class Response<T> {
     ResponseBody response;
     JSON json;
 
-    public Watch(JSON json, ResponseBody body, Type watchType) {
+    /**
+     * Creates a watch on a TYPENAME (T) using an API Client and a Call object.
+     * @param client the API client
+     * @param call the call object returned by api.{ListOperation}Call(...)
+     *             method. Make sure watch flag is set in the call.
+     * @param watchType The type of the WatchResponse<T>. Use something like
+     *                  new TypeToken<Watch.Response<TYPENAME>>(){}.getType()
+     * @param <T> TYPENAME.
+     * @return Watch object on TYPENAME
+     * @throws ApiException on IO exceptions.
+     */
+    public static <T> Watch<T> createWatch(ApiClient client, Call call, Type watchType) throws ApiException {
+        try {
+            com.squareup.okhttp.Response response = call.execute();
+            if (!response.isSuccessful()) {
+                String respBody = null;
+                if (response.body() != null) {
+                    try {
+                        respBody = response.body().string();
+                    } catch (IOException e) {
+                        throw new ApiException(response.message(), e, response.code(), response.headers().toMultimap());
+                    }
+                }
+                throw new ApiException(response.message(), response.code(), response.headers().toMultimap(), respBody);
+            }
+            return new Watch<>(new JSON(client), response.body(), watchType);
+        } catch (IOException e) {
+            throw new ApiException(e);
+        }
+    }
+
+    private Watch(JSON json, ResponseBody body, Type watchType) {
         this.response = body;
         this.watchType = watchType;
         this.json = json;