misc syntax sugar

TylerLeonhardt · TylerLeonhardt · commit 615ebcdd47dd · 2018-08-24T10:35:24.000-07:00
diff --git a/src/Azure.Functions.PowerShell.Worker.Messaging/FunctionMessagingClient.cs b/src/Azure.Functions.PowerShell.Worker.Messaging/FunctionMessagingClient.cs
@@ -14,9 +14,9 @@ namespace Azure.Functions.PowerShell.Worker.Messaging
 {
     public class FunctionMessagingClient : IDisposable
     {
-        public bool isDisposed = false;
-        private AsyncDuplexStreamingCall<StreamingMessage, StreamingMessage> _call;
-        private SemaphoreSlim _writeStreamHandle = new SemaphoreSlim(1, 1);
+        public bool isDisposed;
+        AsyncDuplexStreamingCall<StreamingMessage, StreamingMessage> _call;
+        SemaphoreSlim _writeStreamHandle = new SemaphoreSlim(1, 1);
 
         public FunctionMessagingClient(string host, int port)
         {
@@ -41,19 +41,11 @@ public async Task WriteAsync(StreamingMessage message)
             }
         }
 
-        public async Task<bool> MoveNext()
-        {
-            if(isDisposed) return false;
-
-            return await _call.ResponseStream.MoveNext(CancellationToken.None);
-        }
+        public async Task<bool> MoveNext() =>
+            !isDisposed && await _call.ResponseStream.MoveNext(CancellationToken.None);
 
-        public StreamingMessage GetCurrentMessage()
-        {
-            if(isDisposed) return null;
-
-            return _call.ResponseStream.Current;
-        }
+        public StreamingMessage GetCurrentMessage() =>
+            isDisposed ? null : _call.ResponseStream.Current;
 
         public void Dispose()
         {
diff --git a/src/Azure.Functions.PowerShell.Worker/Function/FunctionLoader.cs b/src/Azure.Functions.PowerShell.Worker/Function/FunctionLoader.cs
@@ -10,7 +10,7 @@ namespace Microsoft.Azure.Functions.PowerShellWorker
 {
     public class FunctionLoader
     {
-        private readonly MapField<string, Function> _LoadedFunctions = new MapField<string, Function>();
+        readonly MapField<string, Function> _LoadedFunctions = new MapField<string, Function>();
         public void Load(string functionId, RpcFunctionMetadata metadata)
         {
             // TODO: catch "load" issues at "func start" time.
diff --git a/src/Azure.Functions.PowerShell.Worker/PowerShell/Host/AzureFunctionsHost.cs b/src/Azure.Functions.PowerShell.Worker/PowerShell/Host/AzureFunctionsHost.cs
@@ -16,35 +16,35 @@ namespace Microsoft.Azure.Functions.PowerShellWorker.PowerShell.Host
     /// applications. Not all members are implemented. Those that aren't throw a
     /// NotImplementedException.
     /// </summary>
-    internal class AzureFunctionsHost : PSHost
+    class AzureFunctionsHost : PSHost
     {
         /// <summary>
         /// The private reference of the logger.
         /// </summary>
-        private RpcLogger _logger;
+        RpcLogger _logger;
 
         /// <summary>
         /// Creates an instance of the PSHostUserInterface object for this
         /// application.
         /// </summary>
-        private HostUserInterface HostUI;
+        HostUserInterface HostUI;
 
         /// <summary>
         /// The culture info of the thread that created
         /// this object.
         /// </summary>
-        private CultureInfo originalCultureInfo = System.Threading.Thread.CurrentThread.CurrentCulture;
+        CultureInfo originalCultureInfo = System.Threading.Thread.CurrentThread.CurrentCulture;
 
         /// <summary>
         /// The UI culture info of the thread that created
         /// this object.
         /// </summary>
-        private CultureInfo originalUICultureInfo = System.Threading.Thread.CurrentThread.CurrentUICulture;
+        CultureInfo originalUICultureInfo = System.Threading.Thread.CurrentThread.CurrentUICulture;
 
         /// <summary>
         /// The identifier of the PSHost implementation.
         /// </summary>
-        private Guid Id = Guid.NewGuid();
+        Guid Id = Guid.NewGuid();
 
         /// <summary>
         /// Initializes a new instance of the Host class. Keep
@@ -99,17 +99,13 @@ public AzureFunctionsHost(RpcLogger logger)
         /// Not implemented by this class. The call fails with an exception.
         /// </summary>
         public override void EnterNestedPrompt()
-        {
-            throw new NotImplementedException("The method or operation is not implemented.");
-        }
+            => throw new NotImplementedException("The method or operation is not implemented.");
 
         /// <summary>
         /// Not implemented by this class. The call fails with an exception.
         /// </summary>
         public override void ExitNestedPrompt()
-        {
-            throw new NotImplementedException("The method or operation is not implemented.");
-        }
+            => throw new NotImplementedException("The method or operation is not implemented.");
 
         /// <summary>
         /// This API is called before an external application process is started. Typically
@@ -139,9 +135,7 @@ public override void NotifyEndApplication()
         /// </summary>
         /// <param name="exitCode">The exit code that the host application should use.</param>
         public override void SetShouldExit(int exitCode)
-        {
-            throw new NotImplementedException("The method or operation is not implemented.");
-        }
+            => throw new NotImplementedException("The method or operation is not implemented.");
     }
 }
 
diff --git a/src/Azure.Functions.PowerShell.Worker/PowerShell/Host/HostUserInterface.cs b/src/Azure.Functions.PowerShell.Worker/PowerShell/Host/HostUserInterface.cs
@@ -19,17 +19,17 @@ namespace Microsoft.Azure.Functions.PowerShellWorker.PowerShell.Host
     /// applications. Few members are actually implemented. Those that aren't throw a
     /// NotImplementedException.
     /// </summary>
-    internal class HostUserInterface : PSHostUserInterface
+    class HostUserInterface : PSHostUserInterface
     {
         /// <summary>
         /// The private reference of the logger.
         /// </summary>
-        private RpcLogger _logger;
+        RpcLogger _logger;
 
         /// <summary>
         /// An instance of the PSRawUserInterface object.
         /// </summary>
-        private RawUserInterface RawUi = new RawUserInterface();
+        RawUserInterface RawUi = new RawUserInterface();
 
         /// <summary>
         /// Gets an instance of the PSRawUserInterface object for this host
@@ -50,10 +50,8 @@ public HostUserInterface(RpcLogger logger)
         /// <param name="descriptions">A collection of FieldDescription objects that 
         /// describe each field of the prompt.</param>
         /// <returns>Throws a NotImplementedException exception because we don't need a prompt.</returns>
-        public override Dictionary<string, PSObject> Prompt(string caption, string message, System.Collections.ObjectModel.Collection<FieldDescription> descriptions)
-        {
+        public override Dictionary<string, PSObject> Prompt(string caption, string message, System.Collections.ObjectModel.Collection<FieldDescription> descriptions) =>
             throw new NotImplementedException("The method or operation is not implemented.");
-        }
 
         /// <summary>
         /// Provides a set of choices that enable the user to choose a single option from a set of options. 
@@ -65,10 +63,8 @@ public override Dictionary<string, PSObject> Prompt(string caption, string messa
         /// <param name="defaultChoice">The index of the label in the Choices parameter 
         /// collection. To indicate no default choice, set to -1.</param>
         /// <returns>Throws a NotImplementedException exception because we don't need a prompt.</returns>
-        public override int PromptForChoice(string caption, string message, System.Collections.ObjectModel.Collection<ChoiceDescription> choices, int defaultChoice)
-        {
+        public override int PromptForChoice(string caption, string message, System.Collections.ObjectModel.Collection<ChoiceDescription> choices, int defaultChoice) =>
             throw new NotImplementedException("The method or operation is not implemented.");
-        }
 
         /// <summary>
         /// Prompts the user for credentials with a specified prompt window caption, 
@@ -79,10 +75,8 @@ public override int PromptForChoice(string caption, string message, System.Colle
         /// <param name="userName">The user name whose credential is to be prompted for.</param>
         /// <param name="targetName">The name of the target for which the credential is collected.</param>
         /// <returns>Throws a NotImplementedException exception because we don't need a prompt.</returns>
-        public override PSCredential PromptForCredential(string caption, string message, string userName, string targetName)
-        {
+        public override PSCredential PromptForCredential(string caption, string message, string userName, string targetName) =>
             throw new NotImplementedException("The method or operation is not implemented.");
-        }
 
         /// <summary>
         /// Prompts the user for credentials by using a specified prompt window caption, 
@@ -98,40 +92,31 @@ public override PSCredential PromptForCredential(string caption, string message,
         /// <param name="options">A PSCredentialUIOptions constant that identifies the UI 
         /// behavior when it gathers the credentials.</param>
         /// <returns>Throws a NotImplementedException exception because we don't need a prompt.</returns>
-        public override PSCredential PromptForCredential(string caption, string message, string userName, string targetName, PSCredentialTypes allowedCredentialTypes, PSCredentialUIOptions options)
-        {
+        public override PSCredential PromptForCredential(string caption, string message, string userName, string targetName, PSCredentialTypes allowedCredentialTypes, PSCredentialUIOptions options) =>
             throw new NotImplementedException("The method or operation is not implemented.");
-        }
 
         /// <summary>
         /// Reads characters that are entered by the user until a newline 
         /// (carriage return) is encountered.
         /// </summary>
         /// <returns>Throws a NotImplemented exception because we are in a non-interactive experience.</returns>
-        public override string ReadLine()
-        {
+        public override string ReadLine() =>
             throw new NotImplementedException("The method or operation is not implemented.");
-        }
 
         /// <summary>
         /// Reads characters entered by the user until a newline (carriage return) 
         /// is encountered and returns the characters as a secure string.
         /// </summary>
         /// <returns>Throws a NotImplemented exception because we are in a non-interactive experience.</returns>
-        public override System.Security.SecureString ReadLineAsSecureString()
-        {
+        public override System.Security.SecureString ReadLineAsSecureString() =>
             throw new NotImplementedException("The method or operation is not implemented.");
-        }
 
         /// <summary>
         /// Writes a new line character (carriage return) to the output display 
         /// of the host.
         /// </summary>
         /// <param name="value">The characters to be written.</param>
-        public override void Write(string value)
-        {
-            _logger.LogInformation(value);
-        }
+        public override void Write(string value) => _logger.LogInformation(value);
 
         /// <summary>
         /// Writes characters to the output display of the host with possible 
@@ -140,48 +125,37 @@ public override void Write(string value)
         /// <param name="foregroundColor">The color of the characters.</param>
         /// <param name="backgroundColor">The backgound color to use.</param>
         /// <param name="value">The characters to be written.</param>
-        public override void Write(ConsoleColor foregroundColor, ConsoleColor backgroundColor, string value)
-        {
-            // Just ignore the colors.
+        public override void Write(ConsoleColor foregroundColor, ConsoleColor backgroundColor, string value) =>
             _logger.LogInformation(value);
-        }
 
         /// <summary>
         /// Writes a debug message to the output display of the host.
         /// </summary>
         /// <param name="message">The debug message that is displayed.</param>
-        public override void WriteDebugLine(string message)
-        {
+        public override void WriteDebugLine(string message) =>
             _logger.LogDebug(String.Format(CultureInfo.CurrentCulture, "DEBUG: {0}", message));
-        }
 
         /// <summary>
         /// Writes an error message to the output display of the host.
         /// </summary>
         /// <param name="value">The error message that is displayed.</param>
-        public override void WriteErrorLine(string value)
-        {
+        public override void WriteErrorLine(string value) =>
             _logger.LogError(String.Format(CultureInfo.CurrentCulture, "ERROR: {0}", value));
-        }
 
         /// <summary>
         /// Writes a newline character (carriage return) 
         /// to the output display of the host. 
         /// </summary>
-        public override void WriteLine()
-        {
-            //do nothing because we don't need to log empty lines
-        }
+        public override void WriteLine() {} //do nothing because we don't need to log empty lines
 
         /// <summary>
         /// Writes a line of characters to the output display of the host 
         /// and appends a newline character(carriage return). 
         /// </summary>
         /// <param name="value">The line to be written.</param>
-        public override void WriteLine(string value)
-        {
+        public override void WriteLine(string value) =>
             _logger.LogInformation(value);
-        }
+
 
         /// <summary>
         /// Writes a line of characters to the output display of the host 
@@ -190,39 +164,30 @@ public override void WriteLine(string value)
         /// <param name="foregroundColor">The forground color of the display. </param>
         /// <param name="backgroundColor">The background color of the display. </param>
         /// <param name="value">The line to be written.</param>
-        public override void WriteLine(ConsoleColor foregroundColor, ConsoleColor backgroundColor, string value)
-        {
-            // Write to the log, ignore the colors
+        public override void WriteLine(ConsoleColor foregroundColor, ConsoleColor backgroundColor, string value) =>
             _logger.LogInformation(value);
-        }
 
         /// <summary>
         /// Writes a progress report to the output display of the host.
         /// </summary>
         /// <param name="sourceId">Unique identifier of the source of the record. </param>
         /// <param name="record">A ProgressReport object.</param>
-        public override void WriteProgress(long sourceId, ProgressRecord record)
-        {
+        public override void WriteProgress(long sourceId, ProgressRecord record) =>
             _logger.LogTrace(String.Format(CultureInfo.CurrentCulture, "PROGRESS: {0}", record.StatusDescription));
-        }
 
         /// <summary>
         /// Writes a verbose message to the output display of the host.
         /// </summary>
         /// <param name="message">The verbose message that is displayed.</param>
-        public override void WriteVerboseLine(string message)
-        {
+        public override void WriteVerboseLine(string message) =>
             _logger.LogTrace(String.Format(CultureInfo.CurrentCulture, "VERBOSE: {0}", message));
-        }
 
         /// <summary>
         /// Writes a warning message to the output display of the host.
         /// </summary>
         /// <param name="message">The warning message that is displayed.</param>
-        public override void WriteWarningLine(string message)
-        {
+        public override void WriteWarningLine(string message) =>
             _logger.LogWarning(String.Format(CultureInfo.CurrentCulture, "WARNING: {0}", message));
-        }
     }
 }
 
diff --git a/src/Azure.Functions.PowerShell.Worker/PowerShell/Host/RawUserInterface.cs b/src/Azure.Functions.PowerShell.Worker/PowerShell/Host/RawUserInterface.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Azure.Functions.PowerShellWorker.PowerShell.Host
     /// class are implemented. More complex methods are not implemented and will
     /// throw a NotImplementedException.
     /// </summary>
-    internal class RawUserInterface : PSHostRawUserInterface
+    class RawUserInterface : PSHostRawUserInterface
     {
         /// <summary>
         /// Gets or sets the background color of text to be written.
diff --git a/src/Azure.Functions.PowerShell.Worker/PowerShell/PowerShellWorkerExtensions.cs b/src/Azure.Functions.PowerShell.Worker/PowerShell/PowerShellWorkerExtensions.cs
@@ -21,7 +21,7 @@ public static class PowerShellWorkerExtensions
         // It logs the item that comes and stores it as the $return out binding.
         // The last item stored as $return will be returned to the function host.
 
-        private static string s_LogAndSetReturnValueScript = @"
+        static string s_LogAndSetReturnValueScript = @"
 param([Parameter(ValueFromPipeline=$true)]$return)
 
 $return | Out-Default
@@ -101,7 +101,7 @@ public static Hashtable ReturnBindingHashtable(this PowerShell ps, IDictionary<s
             }
         }
 
-        private static string BuildBindingHashtableScript(IDictionary<string, BindingInfo> outBindings)
+        static string BuildBindingHashtableScript(IDictionary<string, BindingInfo> outBindings)
         {
             // Since all of the out bindings are stored in variables at this point,
             // we must construct a script that will return those output bindings in a hashtable
@@ -129,7 +129,7 @@ private static string BuildBindingHashtableScript(IDictionary<string, BindingInf
         }
 
         // TODO: make sure this completely cleans up the runspace
-        private static void CleanupRunspace(this PowerShell ps)
+        static void CleanupRunspace(this PowerShell ps)
         {
             ps.Commands.Clear();
         }
diff --git a/src/Azure.Functions.PowerShell.Worker/Requests/HandleFunctionLoadRequest.cs b/src/Azure.Functions.PowerShell.Worker/Requests/HandleFunctionLoadRequest.cs
@@ -12,7 +12,7 @@ namespace  Microsoft.Azure.Functions.PowerShellWorker.Requests
 {
     using System.Management.Automation;
 
-    public class HandleFunctionLoadRequest
+    public static class HandleFunctionLoadRequest
     {
         public static StreamingMessage Invoke(
             PowerShell powershell,
diff --git a/src/Azure.Functions.PowerShell.Worker/Requests/HandleInvocationRequest.cs b/src/Azure.Functions.PowerShell.Worker/Requests/HandleInvocationRequest.cs
@@ -15,7 +15,7 @@ namespace Microsoft.Azure.Functions.PowerShellWorker.Requests
 {
     using System.Management.Automation;
 
-    public class HandleInvocationRequest
+    public static class HandleInvocationRequest
     {
         public static StreamingMessage Invoke(
             PowerShell powershell,
diff --git a/src/Azure.Functions.PowerShell.Worker/Requests/HandleWorkerInitRequest.cs b/src/Azure.Functions.PowerShell.Worker/Requests/HandleWorkerInitRequest.cs
@@ -10,7 +10,7 @@ namespace  Microsoft.Azure.Functions.PowerShellWorker.Requests
 {
     using System.Management.Automation;
 
-    public class HandleWorkerInitRequest
+    public static class HandleWorkerInitRequest
     {
         public static StreamingMessage Invoke(
             PowerShell powershell,
diff --git a/src/Azure.Functions.PowerShell.Worker/Utility/RpcLogger.cs b/src/Azure.Functions.PowerShell.Worker/Utility/RpcLogger.cs
diff --git a/src/Azure.Functions.PowerShell.Worker/Worker.cs b/src/Azure.Functions.PowerShell.Worker/Worker.cs

Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@ namespace Azure.Functions.PowerShell.Worker.Messaging`
`14`	`14`	`{`
`15`	`15`	`public class FunctionMessagingClient : IDisposable`
`16`	`16`	`{`
`17`		`- public bool isDisposed = false;`
`18`		`- private AsyncDuplexStreamingCall<StreamingMessage, StreamingMessage> _call;`
`19`		`- private SemaphoreSlim _writeStreamHandle = new SemaphoreSlim(1, 1);`
	`17`	`+ public bool isDisposed;`
	`18`	`+ AsyncDuplexStreamingCall<StreamingMessage, StreamingMessage> _call;`
	`19`	`+ SemaphoreSlim _writeStreamHandle = new SemaphoreSlim(1, 1);`
`20`	`20`
`21`	`21`	`public FunctionMessagingClient(string host, int port)`
`22`	`22`	`{`
`@@ -41,19 +41,11 @@ public async Task WriteAsync(StreamingMessage message)`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`		`- public async Task<bool> MoveNext()`
`45`		`- {`
`46`		`- if(isDisposed) return false;`
`47`		`-`
`48`		`- return await _call.ResponseStream.MoveNext(CancellationToken.None);`
`49`		`- }`
	`44`	`+ public async Task<bool> MoveNext() =>`
	`45`	`+ !isDisposed && await _call.ResponseStream.MoveNext(CancellationToken.None);`
`50`	`46`
`51`		`- public StreamingMessage GetCurrentMessage()`
`52`		`- {`
`53`		`- if(isDisposed) return null;`
`54`		`-`
`55`		`- return _call.ResponseStream.Current;`
`56`		`- }`
	`47`	`+ public StreamingMessage GetCurrentMessage() =>`
	`48`	`+ isDisposed ? null : _call.ResponseStream.Current;`
`57`	`49`
`58`	`50`	`public void Dispose()`
`59`	`51`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace Microsoft.Azure.Functions.PowerShellWorker`
`10`	`10`	`{`
`11`	`11`	`public class FunctionLoader`
`12`	`12`	`{`
`13`		`- private readonly MapField<string, Function> _LoadedFunctions = new MapField<string, Function>();`
	`13`	`+ readonly MapField<string, Function> _LoadedFunctions = new MapField<string, Function>();`
`14`	`14`	`public void Load(string functionId, RpcFunctionMetadata metadata)`
`15`	`15`	`{`
`16`	`16`	`// TODO: catch "load" issues at "func start" time.`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ namespace Microsoft.Azure.Functions.PowerShellWorker.PowerShell.Host`
`14`	`14`	`/// class are implemented. More complex methods are not implemented and will`
`15`	`15`	`/// throw a NotImplementedException.`
`16`	`16`	`/// </summary>`
`17`		`- internal class RawUserInterface : PSHostRawUserInterface`
	`17`	`+ class RawUserInterface : PSHostRawUserInterface`
`18`	`18`	`{`
`19`	`19`	`/// <summary>`
`20`	`20`	`/// Gets or sets the background color of text to be written.`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public static class PowerShellWorkerExtensions`
`21`	`21`	`// It logs the item that comes and stores it as the $return out binding.`
`22`	`22`	`// The last item stored as $return will be returned to the function host.`
`23`	`23`
`24`		`- private static string s_LogAndSetReturnValueScript = @"`
	`24`	`+ static string s_LogAndSetReturnValueScript = @"`
`25`	`25`	`param([Parameter(ValueFromPipeline=$true)]$return)`
`26`	`26`
`27`	`27`	`$return \| Out-Default`
`@@ -101,7 +101,7 @@ public static Hashtable ReturnBindingHashtable(this PowerShell ps, IDictionary<s`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
`104`		`- private static string BuildBindingHashtableScript(IDictionary<string, BindingInfo> outBindings)`
	`104`	`+ static string BuildBindingHashtableScript(IDictionary<string, BindingInfo> outBindings)`
`105`	`105`	`{`
`106`	`106`	`// Since all of the out bindings are stored in variables at this point,`
`107`	`107`	`// we must construct a script that will return those output bindings in a hashtable`
`@@ -129,7 +129,7 @@ private static string BuildBindingHashtableScript(IDictionary<string, BindingInf`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`// TODO: make sure this completely cleans up the runspace`
`132`		`- private static void CleanupRunspace(this PowerShell ps)`
	`132`	`+ static void CleanupRunspace(this PowerShell ps)`
`133`	`133`	`{`
`134`	`134`	`ps.Commands.Clear();`
`135`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace Microsoft.Azure.Functions.PowerShellWorker.Requests`
`12`	`12`	`{`
`13`	`13`	`using System.Management.Automation;`
`14`	`14`
`15`		`- public class HandleFunctionLoadRequest`
	`15`	`+ public static class HandleFunctionLoadRequest`
`16`	`16`	`{`
`17`	`17`	`public static StreamingMessage Invoke(`
`18`	`18`	`PowerShell powershell,`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ namespace Microsoft.Azure.Functions.PowerShellWorker.Requests`
`15`	`15`	`{`
`16`	`16`	`using System.Management.Automation;`
`17`	`17`
`18`		`- public class HandleInvocationRequest`
	`18`	`+ public static class HandleInvocationRequest`
`19`	`19`	`{`
`20`	`20`	`public static StreamingMessage Invoke(`
`21`	`21`	`PowerShell powershell,`