move class to single files

Author: tg123

src/KubernetesClient/ModelExtensions.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net;
 
 namespace k8s.Models
 {
@@ -487,20 +486,4 @@ public static bool Matches(this V1OwnerReference owner, IKubernetesObject<V1Obje
             return owner.ApiVersion == obj.ApiVersion && owner.Kind == obj.Kind && owner.Name == obj.Name() && owner.Uid == obj.Uid();
         }
     }
-
-    public partial class V1Status
-    {
-        /// <summary>Converts a <see cref="V1Status"/> object into a short description of the status.</summary>
-        public override string ToString()
-        {
-            string reason = Reason;
-            if (string.IsNullOrEmpty(reason) && Code.GetValueOrDefault() != 0)
-            {
-                reason = ((HttpStatusCode)Code.Value).ToString();
-            }
-
-            return string.IsNullOrEmpty(Message) ? string.IsNullOrEmpty(reason) ? Status : reason :
-                string.IsNullOrEmpty(reason) ? Message : $"{reason} - {Message}";
-        }
-    }
 }

src/KubernetesClient/V1Status.cs

@@ -0,0 +1,20 @@
+using System.Net;
+
+namespace k8s.Models
+{
+    public partial class V1Status
+    {
+        /// <summary>Converts a <see cref="V1Status"/> object into a short description of the status.</summary>
+        public override string ToString()
+        {
+            string reason = Reason;
+            if (string.IsNullOrEmpty(reason) && Code.GetValueOrDefault() != 0)
+            {
+                reason = ((HttpStatusCode)Code.Value).ToString();
+            }
+
+            return string.IsNullOrEmpty(Message) ? string.IsNullOrEmpty(reason) ? Status : reason :
+                string.IsNullOrEmpty(reason) ? Message : $"{reason} - {Message}";
+        }
+    }
+}

src/KubernetesClient/Watcher.cs

@@ -3,9 +3,7 @@
 using System.Runtime.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
-using k8s.Exceptions;
 using k8s.Models;
-using Microsoft.Rest;
 using Microsoft.Rest.Serialization;
 
 namespace k8s
@@ -177,57 +175,4 @@ private async Task WatcherLoop(CancellationToken cancellationToken)
             }
         }
     }
-
-    public static class WatcherExt
-    {
-        /// <summary>
-        /// create a watch object from a call to api server with watch=true
-        /// </summary>
-        /// <typeparam name="T">type of the event object</typeparam>
-        /// <typeparam name="L">type of the HttpOperationResponse object</typeparam>
-        /// <param name="response">the api response</param>
-        /// <param name="onEvent">a callback when any event raised from api server</param>
-        /// <param name="onError">a callbak when any exception was caught during watching</param>
-        /// <param name="onClosed">
-        /// The action to invoke when the server closes the connection.
-        /// </param>
-        /// <returns>a watch object</returns>
-        public static Watcher<T> Watch<T, L>(this Task<HttpOperationResponse<L>> responseTask,
-            Action<WatchEventType, T> onEvent,
-            Action<Exception> onError = null,
-            Action onClosed = null)
-        {
-            return new Watcher<T>(async () =>
-            {
-                var response = await responseTask.ConfigureAwait(false);
-
-                if (!(response.Response.Content is WatcherDelegatingHandler.LineSeparatedHttpContent content))
-                {
-                    throw new KubernetesClientException("not a watchable request or failed response");
-                }
-
-                return content.StreamReader;
-            }, onEvent, onError, onClosed);
-        }
-
-        /// <summary>
-        /// create a watch object from a call to api server with watch=true
-        /// </summary>
-        /// <typeparam name="T">type of the event object</typeparam>
-        /// <typeparam name="L">type of the HttpOperationResponse object</typeparam>
-        /// <param name="response">the api response</param>
-        /// <param name="onEvent">a callback when any event raised from api server</param>
-        /// <param name="onError">a callbak when any exception was caught during watching</param>
-        /// <param name="onClosed">
-        /// The action to invoke when the server closes the connection.
-        /// </param>
-        /// <returns>a watch object</returns>
-        public static Watcher<T> Watch<T, L>(this HttpOperationResponse<L> response,
-            Action<WatchEventType, T> onEvent,
-            Action<Exception> onError = null,
-            Action onClosed = null)
-        {
-            return Watch(Task.FromResult(response), onEvent, onError, onClosed);
-        }
-    }
 }

src/KubernetesClient/WatcherExt.cs

@@ -0,0 +1,60 @@
+using System;
+using System.Threading.Tasks;
+using k8s.Exceptions;
+using Microsoft.Rest;
+
+namespace k8s
+{
+    public static class WatcherExt
+    {
+        /// <summary>
+        /// create a watch object from a call to api server with watch=true
+        /// </summary>
+        /// <typeparam name="T">type of the event object</typeparam>
+        /// <typeparam name="L">type of the HttpOperationResponse object</typeparam>
+        /// <param name="response">the api response</param>
+        /// <param name="onEvent">a callback when any event raised from api server</param>
+        /// <param name="onError">a callbak when any exception was caught during watching</param>
+        /// <param name="onClosed">
+        /// The action to invoke when the server closes the connection.
+        /// </param>
+        /// <returns>a watch object</returns>
+        public static Watcher<T> Watch<T, L>(this Task<HttpOperationResponse<L>> responseTask,
+            Action<WatchEventType, T> onEvent,
+            Action<Exception> onError = null,
+            Action onClosed = null)
+        {
+            return new Watcher<T>(async () =>
+            {
+                var response = await responseTask.ConfigureAwait(false);
+
+                if (!(response.Response.Content is WatcherDelegatingHandler.LineSeparatedHttpContent content))
+                {
+                    throw new KubernetesClientException("not a watchable request or failed response");
+                }
+
+                return content.StreamReader;
+            }, onEvent, onError, onClosed);
+        }
+
+        /// <summary>
+        /// create a watch object from a call to api server with watch=true
+        /// </summary>
+        /// <typeparam name="T">type of the event object</typeparam>
+        /// <typeparam name="L">type of the HttpOperationResponse object</typeparam>
+        /// <param name="response">the api response</param>
+        /// <param name="onEvent">a callback when any event raised from api server</param>
+        /// <param name="onError">a callbak when any exception was caught during watching</param>
+        /// <param name="onClosed">
+        /// The action to invoke when the server closes the connection.
+        /// </param>
+        /// <returns>a watch object</returns>
+        public static Watcher<T> Watch<T, L>(this HttpOperationResponse<L> response,
+            Action<WatchEventType, T> onEvent,
+            Action<Exception> onError = null,
+            Action onClosed = null)
+        {
+            return Watch(Task.FromResult(response), onEvent, onError, onClosed);
+        }
+    }
+}

tests/KubernetesClient.Tests/KubernetesClientConfigurationTests.cs

@@ -434,7 +434,7 @@ public void LoadKubeConfigFromEnvironmentVariable()
         }
 
         [Fact]
-        public void LoadKubeConfigFromEnvironmentVariable_MultipleConfigs()
+        public void LoadKubeConfigFromEnvironmentVariableMultipleConfigs()
         {
             // This test makes sure that a list of environment variables works (no exceptions),
             // doesn't check validity of configuration, which is done in other tests.