From 2aa2ede31fe308e5e590fb9b4e9262b4b20b099c Mon Sep 17 00:00:00 2001
From: Ryland Degnan <ryland@netifi.com>
Date: Mon, 27 May 2019 22:53:32 -0700
Subject: [PATCH] Remove hard coded service name from generator

---
 RSocket.Rpc.Protobuf/src/csharp_generator.cc |  3 ++-
 RSocket.Rpc.Sample/EchoService.proto         | 22 --------------------
 RSocket.Rpc.Sample/RSocket.Rpc.Sample.csproj |  6 +++---
 RSocket.Rpc.Tools/RSocket.Rpc.Tools.csproj   | 13 ++++++++++--
 4 files changed, 16 insertions(+), 28 deletions(-)
 delete mode 100644 RSocket.Rpc.Sample/EchoService.proto

diff --git a/RSocket.Rpc.Protobuf/src/csharp_generator.cc b/RSocket.Rpc.Protobuf/src/csharp_generator.cc
index 7c12b45..cb176ff 100644
--- a/RSocket.Rpc.Protobuf/src/csharp_generator.cc
+++ b/RSocket.Rpc.Protobuf/src/csharp_generator.cc
@@ -390,7 +390,8 @@ void GenerateServerClass(Printer* out, const ServiceDescriptor* service) {
     }
   }
 
-  out->Print("static IAsyncEnumerable<byte[]> Dispatch(IEchoService service, ReadOnlySequence<byte> data, string method, in ReadOnlySequence<byte> tracing, in ReadOnlySequence<byte> metadata, IAsyncEnumerable<byte[]> messages)\n");
+  out->Print("static IAsyncEnumerable<byte[]> Dispatch($interfacename$ service, ReadOnlySequence<byte> data, string method, in ReadOnlySequence<byte> tracing, in ReadOnlySequence<byte> metadata, IAsyncEnumerable<byte[]> messages)\n",
+             "interfacename", GetInterfaceName(service));
   out->Print("{\n");
   out->Indent();
   out->Print("switch (method)\n");
diff --git a/RSocket.Rpc.Sample/EchoService.proto b/RSocket.Rpc.Sample/EchoService.proto
deleted file mode 100644
index bcdd156..0000000
--- a/RSocket.Rpc.Sample/EchoService.proto
+++ /dev/null
@@ -1,22 +0,0 @@
-syntax = "proto3";
-
-package io.rsocket.rpc.echo;
-
-import "google/protobuf/empty.proto";
-import "google/protobuf/wrappers.proto";
-import "rsocket/options.proto";
-
-option java_package = "io.rsocket.rpc.echo";
-option java_outer_classname = "EchoServiceProto";
-option java_multiple_files = true;
-
-service EchoService {
-  rpc fireAndForget (google.protobuf.BytesValue) returns (google.protobuf.Empty) {
-    option (io.rsocket.rpc.options) = {
-      fire_and_forget: true
-    };
-  }
-  rpc requestResponse (google.protobuf.BytesValue) returns (google.protobuf.BytesValue);
-  rpc requestStream (google.protobuf.BytesValue) returns (stream google.protobuf.BytesValue);
-  rpc requestChannel(stream google.protobuf.BytesValue) returns (stream google.protobuf.BytesValue);
-}
\ No newline at end of file
diff --git a/RSocket.Rpc.Sample/RSocket.Rpc.Sample.csproj b/RSocket.Rpc.Sample/RSocket.Rpc.Sample.csproj
index 15a23af..ec17d49 100644
--- a/RSocket.Rpc.Sample/RSocket.Rpc.Sample.csproj
+++ b/RSocket.Rpc.Sample/RSocket.Rpc.Sample.csproj
@@ -46,8 +46,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProtoBuf Include="rsocket\options.proto" RSocketRpcServices="None" />
-    <ProtoBuf Include="echo.proto" RSocketRpcServices="Both" />
+    <ProtoBuf Include="rsocket\options.proto" />
+    <ProtoBuf Include="**\*.proto" />
   </ItemGroup>
-
+  
 </Project>
diff --git a/RSocket.Rpc.Tools/RSocket.Rpc.Tools.csproj b/RSocket.Rpc.Tools/RSocket.Rpc.Tools.csproj
index 21cc5f9..01c57c1 100644
--- a/RSocket.Rpc.Tools/RSocket.Rpc.Tools.csproj
+++ b/RSocket.Rpc.Tools/RSocket.Rpc.Tools.csproj
@@ -28,8 +28,17 @@ Linux and MacOS. Managed runtime is supplied separately in the RSocket.Rpc.Core
     <None Pack="true" PackagePath="build\" Include="build\**\*.xml; build\**\*.props; build\**\*.targets;" />
 
     <!-- Protobuf assets (for Google.Protobuf.Tools) -->
-    <_ProtoAssetName Include="any;api;descriptor;duration;empty;field_mask;source_context;struct;timestamp;type;wrappers" />
-    <_Asset PackagePath="build/native/include/google/protobuf/" Include="@(_ProtoAssetName->'$(Assets_ProtoInclude)/google/protobuf/%(Identity).proto')" />
+    <_Asset PackagePath="build/native/include/google/protobuf" Include="$(Assets_ProtoInclude)/google/protobuf/any.proto" />
+    <_Asset PackagePath="build/native/include/google/protobuf" Include="$(Assets_ProtoInclude)/google/protobuf/api.proto" />
+    <_Asset PackagePath="build/native/include/google/protobuf" Include="$(Assets_ProtoInclude)/google/protobuf/descriptor.proto" />
+    <_Asset PackagePath="build/native/include/google/protobuf" Include="$(Assets_ProtoInclude)/google/protobuf/duration.proto" />
+    <_Asset PackagePath="build/native/include/google/protobuf" Include="$(Assets_ProtoInclude)/google/protobuf/empty.proto" />
+    <_Asset PackagePath="build/native/include/google/protobuf" Include="$(Assets_ProtoInclude)/google/protobuf/field_mask.proto" />
+    <_Asset PackagePath="build/native/include/google/protobuf" Include="$(Assets_ProtoInclude)/google/protobuf/source_context.proto" />
+    <_Asset PackagePath="build/native/include/google/protobuf" Include="$(Assets_ProtoInclude)/google/protobuf/struct.proto" />
+    <_Asset PackagePath="build/native/include/google/protobuf" Include="$(Assets_ProtoInclude)/google/protobuf/timestamp.proto" />
+    <_Asset PackagePath="build/native/include/google/protobuf" Include="$(Assets_ProtoInclude)/google/protobuf/type.proto" />
+    <_Asset PackagePath="build/native/include/google/protobuf" Include="$(Assets_ProtoInclude)/google/protobuf/wrappers.proto" />
     <_Asset PackagePath="build/native/include/rsocket/" Include="$(Assets_ProtoInclude)/rsocket/options.proto" />
     <_Asset PackagePath="tools/windows_x64/" Include="$(Assets_ProtoCompiler)windows_x64/protoc.exe" />
     <_Asset PackagePath="tools/linux_x64/" Include="$(Assets_ProtoCompiler)linux_x64/protoc" />