THRIFT-5504 CA2254 Message template should be compile time constant
Client netstd
Patch: Jens Geyer
diff --git a/lib/netstd/Thrift/Server/TServer.cs b/lib/netstd/Thrift/Server/TServer.cs
index 3fd0bc5..3d4f3fc 100644
--- a/lib/netstd/Thrift/Server/TServer.cs
+++ b/lib/netstd/Thrift/Server/TServer.cs
@@ -35,7 +35,7 @@
protected TProtocolFactory OutputProtocolFactory;
protected TTransportFactory OutputTransportFactory;
- protected TServerEventHandler ServerEventHandler;
+ protected ITServerEventHandler ServerEventHandler;
protected TServerTransport ServerTransport;
protected TServer(ITProcessorFactory processorFactory, TServerTransport serverTransport,
@@ -52,12 +52,12 @@
Logger = logger; // null is absolutely legal
}
- public void SetEventHandler(TServerEventHandler seh)
+ public void SetEventHandler(ITServerEventHandler seh)
{
ServerEventHandler = seh;
}
- public TServerEventHandler GetEventHandler()
+ public ITServerEventHandler GetEventHandler()
{
return ServerEventHandler;
}
@@ -66,7 +66,7 @@
protected void LogError( string msg)
{
if (Logger != null)
- Logger.LogError(msg);
+ Logger.LogError("{Msg}",msg); // NOTE: Log message template, not string interpolation!
}
public abstract void Stop();
diff --git a/lib/netstd/Thrift/Server/TServerEventHandler.cs b/lib/netstd/Thrift/Server/TServerEventHandler.cs
index 69314ef..9226b42 100644
--- a/lib/netstd/Thrift/Server/TServerEventHandler.cs
+++ b/lib/netstd/Thrift/Server/TServerEventHandler.cs
@@ -25,10 +25,18 @@
//TODO: replacement by event?
/// <summary>
- /// Interface implemented by server users to handle events from the server
+ /// Interface implemented by server users to handle events from the server
/// </summary>
+ /// <remarks>Replaced by ITServerEventHandler</remarks>
// ReSharper disable once InconsistentNaming
- public interface TServerEventHandler
+ #pragma warning disable IDE1006
+ public interface TServerEventHandler : ITServerEventHandler { }
+ #pragma warning restore IDE1006
+
+ /// <summary>
+ /// Interface implemented by server users to handle events from the server
+ /// </summary>
+ public interface ITServerEventHandler
{
/// <summary>
/// Called before the server begins */
diff --git a/lib/netstd/Thrift/Server/TSimpleAsyncServer.cs b/lib/netstd/Thrift/Server/TSimpleAsyncServer.cs
index d46d58a..f1f6277 100644
--- a/lib/netstd/Thrift/Server/TSimpleAsyncServer.cs
+++ b/lib/netstd/Thrift/Server/TSimpleAsyncServer.cs
@@ -23,8 +23,6 @@
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
-#pragma warning disable IDE0079 // remove unnecessary pragmas
-#pragma warning disable IDE0063 // using can be simplified, we don't
namespace Thrift.Server
{
diff --git a/lib/netstd/Thrift/Server/TThreadPoolAsyncServer.cs b/lib/netstd/Thrift/Server/TThreadPoolAsyncServer.cs
index ba1834c..efa1698 100644
--- a/lib/netstd/Thrift/Server/TThreadPoolAsyncServer.cs
+++ b/lib/netstd/Thrift/Server/TThreadPoolAsyncServer.cs
@@ -29,8 +29,6 @@
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
-#pragma warning disable IDE0079 // remove unnecessary pragmas
-#pragma warning disable IDE0063 // using can be simplified, we don't
namespace Thrift.Server
{