fix #106

Author: mgravell

docs/releasenotes.md

@@ -4,6 +4,7 @@
 
 - add `[SimpleRpcExceptions]` (which can be applied at service contract, service type, or service method levels), and `SimpleRpcExceptionsInterceptor` (which can be applied to any service registration) - which expose server exceptions more conveniently (#75)
 - use linker-friendly metadata inspection (#90)
+- add non-generic `AddCodeFirst` native server overload (#106)
 
 ## 1.0.90
 

src/protobuf-net.Grpc.Native/Server/ServiceDefinitionCollectionExtensions.cs

@@ -30,9 +30,24 @@ public static int AddCodeFirst<TService>(this ServiceDefinitionCollection servic
             TextWriter? log = null,
             IEnumerable<Interceptor>? interceptors = null)
             where TService : class
+            => AddCodeFirstImpl(services, service, typeof(TService), binderConfiguration, log, interceptors);
+
+        /// <summary>
+        /// Adds a code-first service to the available services
+        /// </summary>
+        public static int AddCodeFirst(this ServiceDefinitionCollection services, object service,
+            BinderConfiguration? binderConfiguration = null,
+            TextWriter? log = null,
+            IEnumerable<Interceptor>? interceptors = null)
+            => AddCodeFirstImpl(services, service, service?.GetType() ?? throw new ArgumentNullException(nameof(service)), binderConfiguration, log, interceptors);
+
+        private static int AddCodeFirstImpl(ServiceDefinitionCollection services, object service, Type serviceType,
+            BinderConfiguration? binderConfiguration,
+            TextWriter? log,
+            IEnumerable<Interceptor>? interceptors)
         {
             var builder = ServerServiceDefinition.CreateBuilder();
-            int count = Binder.Create(log).Bind<TService>(builder, binderConfiguration, service);
+            int count = Binder.Create(log).Bind(builder, serviceType, binderConfiguration, service);
             var serverServiceDefinition = builder.Build();
 
             if (interceptors is object)

tests/protobuf-net.Grpc.Test.Integration/GrpcServiceTests.cs

@@ -114,7 +114,8 @@ public GrpcServiceFixture()
             {
                 Ports = { new ServerPort("localhost", Port, ServerCredentials.Insecure) }
             };
-            _server.Services.AddCodeFirst(new ApplyServices());
+            object nonGeneric = new ApplyServices();
+            _server.Services.AddCodeFirst(nonGeneric);
             _server.Services.AddCodeFirst(new AdhocService(), AdhocConfig.ClientFactory);
             _server.Services.AddCodeFirst(new InterceptedService(), interceptors: new[] { _interceptor });
             _server.Start();

tests/protobuf-net.Grpc.Test/AttributeDetection.cs

@@ -68,8 +68,8 @@ public void CheckTypeAttributes(Type type, bool inherit, string expectedFoo, str
             => CheckResults(AttributeHelper.For(type, inherit), expectedFoo, expectedBar);
         private static void CheckResults(AttributeHelper attribs, string expectedFoo, string expectedBar)
         {
-            var fooResult = attribs.TryGetAnyNonWhitespaceString(typeof(FooAttribute).FullName, "Name", out var actualFoo);
-            var barResult = attribs.TryGetAnyNonWhitespaceString(typeof(BarAttribute).FullName, "Name", out var actualBar);
+            var fooResult = attribs.TryGetAnyNonWhitespaceString(typeof(FooAttribute).FullName!, "Name", out var actualFoo);
+            var barResult = attribs.TryGetAnyNonWhitespaceString(typeof(BarAttribute).FullName!, "Name", out var actualBar);
 
             if (string.IsNullOrWhiteSpace(expectedFoo))
             {
@@ -120,7 +120,7 @@ private static void CheckResults(AttributeHelper attribs, string expectedFoo, st
         [InlineData(typeof(SomeLeafType), "D", false, null, null)]
 
         public void CheckMethodAttributes(Type type, string method, bool inherit, string expectedFoo, string expectedBar)
-            => CheckResults(AttributeHelper.For(type.GetMethod(method), inherit), expectedFoo, expectedBar);
+            => CheckResults(AttributeHelper.For(type.GetMethod(method)!, inherit), expectedFoo, expectedBar);
 
         [Foo("base")]
         [Bar("base bar")]