Merge pull request #1073 from filipw/http-reuse-jsonserializer

reuse JsonSerializer in the HTTP server
OmniSharp · Jan 8, 2018 · 108dd1a · 108dd1a
2 parents f224846 + d03997f
commit 108dd1a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 16 deletions.
diff --git a/src/OmniSharp.Host/WorkspaceInitializer.cs b/src/OmniSharp.Host/WorkspaceInitializer.cs
@@ -30,7 +30,7 @@ public static void Initialize(
             {
                 try
                 {
-                    var projectConfiguration = configuration.GetSection((string)projectSystem.Key);
+                    var projectConfiguration = configuration.GetSection(projectSystem.Key);
                     var enabledProjectFlag = projectConfiguration.GetValue<bool>("enabled", defaultValue: true);
                     if (enabledProjectFlag)
                     {
@@ -45,7 +45,7 @@ public static void Initialize(
                 {
                     var message = $"The project system '{projectSystem.GetType().FullName}' threw exception during initialization.";
                     // if a project system throws an unhandled exception it should not crash the entire server
-                    LoggerExceptions.LogError((ILogger)logger, e, message);
+                    logger.LogError(e, message);
                 }
             }
 
@@ -61,7 +61,7 @@ public static void Initialize(
                 ProvideWorkspaceOptions(compositionHost, workspace, options, logger);
             });
 
-            LoggerExtensions.LogInformation((ILogger)logger, "Configuration finished.");
+            logger.LogInformation("Configuration finished.");
         }
 
         private static void ProvideWorkspaceOptions(
@@ -83,7 +83,7 @@ private static void ProvideWorkspaceOptions(
                 catch (Exception e)
                 {
                     var message = $"The workspace options provider '{providerName}' threw exception during initialization.";
-                    LoggerExceptions.LogError(logger, e, message);
+                    logger.LogError(e, message);
                 }
             }
         }

diff --git a/src/OmniSharp.Http/Middleware/EndpointMiddleware.cs b/src/OmniSharp.Http/Middleware/EndpointMiddleware.cs
@@ -93,7 +93,8 @@ public async Task Invoke(HttpContext httpContext)
                             Command = endpoint,
                             ArgumentsStream = httpContext.Request.Body
                         });
-                        MiddlewareHelpers.WriteTo(httpContext.Response, response);
+
+                        httpContext.Response.WriteJson(response);
                         return;
                     }
                 }

diff --git a/...harp.Http/Middleware/MiddlewareHelpers.cs → ...p.Http/Middleware/MiddlewareExtensions.cs b/...harp.Http/Middleware/MiddlewareHelpers.cs → ...p.Http/Middleware/MiddlewareExtensions.cs
@@ -5,18 +5,18 @@
 
 namespace OmniSharp.Http.Middleware
 {
-    static class MiddlewareHelpers
+    static class MiddlewareExtensions
     {
-        private static readonly Encoding _encoding = new System.Text.UTF8Encoding(false);
+        private static readonly JsonSerializer _jsonSerializer = JsonSerializer.Create();
+        private static readonly Encoding _encoding = new UTF8Encoding(false);
 
-        public static void WriteTo(HttpResponse response, object value)
+        public static void WriteJson(this HttpResponse response, object value)
         {
             using (var writer = new StreamWriter(response.Body, _encoding, 1024, true))
             using (var jsonWriter = new JsonTextWriter(writer))
             {
                 jsonWriter.CloseOutput = false;
-                var jsonSerializer = JsonSerializer.Create(/*TODO: SerializerSettings*/);
-                jsonSerializer.Serialize(jsonWriter, value);
+                _jsonSerializer.Serialize(jsonWriter, value);
             }
         }
     }

diff --git a/src/OmniSharp.Http/Middleware/StatusMiddleware.cs b/src/OmniSharp.Http/Middleware/StatusMiddleware.cs
@@ -21,13 +21,13 @@ public async Task Invoke(HttpContext httpContext)
                 var endpoint = httpContext.Request.Path.Value;
                 if (endpoint == OmniSharpEndpoints.CheckAliveStatus)
                 {
-                    MiddlewareHelpers.WriteTo(httpContext.Response, true);
+                    httpContext.Response.WriteJson(true);
                     return;
                 }
 
                 if (endpoint == OmniSharpEndpoints.CheckReadyStatus)
                 {
-                    MiddlewareHelpers.WriteTo(httpContext.Response, _workspace.Initialized);
+                    httpContext.Response.WriteJson(_workspace.Initialized);
                     return;
                 }
             }

diff --git a/src/OmniSharp.Http/Startup.cs b/src/OmniSharp.Http/Startup.cs
@@ -44,10 +44,7 @@ public void Configure(
             IApplicationBuilder app,
             IServiceProvider serviceProvider,
             ILoggerFactory loggerFactory,
-            IEventEmitter eventEmitter,
-            ISharedTextWriter writer,
-            HttpEnvironment httpEnvironment,
-            IOptionsMonitor<OmniSharpOptions> options)
+            HttpEnvironment httpEnvironment)
         {
             var workspace = _compositionHost.GetExport<OmniSharpWorkspace>();
             var logger = loggerFactory.CreateLogger<Startup>();