RPC Tests for RequestReponse. Updates to signature of generated methods to inject the method name automatically and to use a class-level service name (like Java). striving for simplest possible generated code.

Author: dbarnett-netifi

RSocket.Core/RSocketServer.cs

@@ -41,6 +41,7 @@ public virtual void RequestStream(in RSocketProtocol.RequestStream message, Read
 
 		public virtual void RequestResponse(in RSocketProtocol.RequestResponse message, ReadOnlySequence<byte> metadata, ReadOnlySequence<byte> data)
 		{
+			Transport.Output.FlushAsync();
 		}
 
 		public virtual void RequestFireAndForget(in RSocketProtocol.RequestFireAndForget message, ReadOnlySequence<byte> metadata, ReadOnlySequence<byte> data)

RSocket.RPC.Tests/RSocketServiceTests.cs

@@ -21,11 +21,11 @@ public class RSocketServiceTests
 		[TestMethod]
 		public void ServerBasicTest()
 		{
-			//var data = new TestData();
-			//var response = Service.RequestResponse(data).Result;
-			//var result = new TestData(response);
+			var data = new TestData();
+			var response = Service.RequestResponse(data).Result;
+			var result = new TestData(response);
 
-			//Assert.AreEqual(data, result, $"{nameof(Service.RequestResponse)} did not round trip on bytes.");
+			Assert.AreEqual(data, result, $"{nameof(Service.RequestResponse)} did not round trip on bytes.");
 
 			//public Task<ReadOnlySequence<byte>> requestResponse(ReadOnlySequence<byte> data, ReadOnlySequence<byte> metadata = default) => base.RequestResponse<ReadOnlySequence<byte>>(ServicePrefix + nameof(EchoService), nameof(requestResponse), data, metadata);
 			//public Task<ReadOnlySequence<byte>> requestStream(ReadOnlySequence<byte> data, ReadOnlySequence<byte> metadata = default) => base.RequestStream<ReadOnlySequence<byte>>(ServicePrefix + nameof(EchoService), nameof(requestStream), data, metadata);
@@ -38,10 +38,10 @@ public void ServerBasicTest()
 		[System.Runtime.CompilerServices.CompilerGenerated]
 		public class TestService : RSocketService<TestService>
 		{
-			private const string ServicePrefix = "";
+			private const string SERVICE = nameof(TestService);
 			public TestService(RSocketClient client) : base(client) { }
 			//public void fireAndForget(ReadOnlySequence<byte> data, ReadOnlySequence<byte> metadata = default) { Client.RequestFireAndForget(null, data, metadata); }
-			//public Task<ReadOnlySequence<byte>> RequestResponse(ReadOnlySequence<byte> data, ReadOnlySequence<byte> metadata = default) => base.__RequestResponse<ReadOnlySequence<byte>>(ServicePrefix + nameof(TestService), nameof(RequestResponse), data, metadata);
+			public Task<ReadOnlySequence<byte>> RequestResponse(ReadOnlySequence<byte> data, ReadOnlySequence<byte> metadata = default) => __RequestResponse(data, metadata, service: SERVICE);
 			//public Task<ReadOnlySequence<byte>> RequestStream(ReadOnlySequence<byte> data, ReadOnlySequence<byte> metadata = default) => base.__RequestStream<ReadOnlySequence<byte>>(ServicePrefix + nameof(TestService), nameof(RequestStream), data, metadata);
 			//public void requestChannel(ReadOnlySequence<byte> data, ReadOnlySequence<byte> metadata = default) { Client.RequestChannel(null, data, metadata); }
 		}
@@ -52,8 +52,9 @@ public TestService(RSocketClient client) : base(client) { }
 		public void SupportTests()
 		{
 			var data = new TestData();
-			var result = new TestData(data);
-			Assert.AreEqual(data, result, $"TestData did not round trip on bytes.");
+			var bytecopy = new TestData(data);
+			Assert.AreEqual(data.GetHashCode(), bytecopy.GetHashCode(), $"TestData byte constructor did not result in hascode equality.");
+			Assert.AreEqual(data, bytecopy, $"TestData byte constructor did not result in equality.");
 		}
 
 		public class TestData

RSocket.RPC/RSocketService.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using System.Runtime.CompilerServices;
 
 namespace RSocket.RPC
 {
@@ -14,14 +15,27 @@ public abstract class RSocketService<T> : IRSocketStream
 
 		protected void __RequestFireAndForget(ReadOnlySequence<byte> data, ReadOnlySequence<byte> metadata = default) { Client.RequestFireAndForget(null, data, metadata); }
 
+		protected async Task<TResult> __RequestFireAndForget<TMessage, TResult>(string service, string method, TMessage message, Func<TMessage, byte[]> intransform, Func<byte[], TResult> outtransform, ReadOnlySequence<byte> metadata = default, ReadOnlySequence<byte> tracing = default) =>
+			outtransform((await __RequestFireAndForget(service, method, new ReadOnlySequence<byte>(intransform(message)), metadata, tracing)).ToArray());
 
-		protected async Task<TResult> __RequestResponse<TMessage, TResult>(string service, string method, TMessage message, Func<TMessage, byte[]> intransform, Func<byte[], TResult> outtransform, ReadOnlySequence<byte> metadata = default, ReadOnlySequence<byte> tracing = default) =>
-			outtransform((await __RequestResponse(service, method, new ReadOnlySequence<byte>(intransform(message)), metadata, tracing)).ToArray());
+		protected async Task<TResult> __RequestFireAndForget<TMessage, TResult>(string service, string method, TMessage message, Func<TMessage, ReadOnlySequence<byte>> intransform, Func<ReadOnlySequence<byte>, TResult> outtransform, ReadOnlySequence<byte> metadata = default, ReadOnlySequence<byte> tracing = default) =>
+			outtransform(await __RequestFireAndForget(service, method, intransform(message), metadata, tracing));
 
-		protected async Task<TResult> __RequestResponse<TMessage, TResult>(string service, string method, TMessage message, Func<TMessage, ReadOnlySequence<byte>> intransform, Func<ReadOnlySequence<byte>, TResult> outtransform, ReadOnlySequence<byte> metadata = default, ReadOnlySequence<byte> tracing = default) =>
-			outtransform(await __RequestResponse(service, method, intransform(message), metadata, tracing));
+		protected async Task<ReadOnlySequence<byte>> __RequestFireAndForget(string service, string method, ReadOnlySequence<byte> data, ReadOnlySequence<byte> metadata = default, ReadOnlySequence<byte> tracing = default)
+		{
+			var receiver = new Receiver();
+			await Client.RequestResponse(receiver, data, new RemoteProcedureCall.RemoteProcedureCallMetadata(service, method, metadata, tracing));
+			return await receiver.Task.ConfigureAwait(false);
+		}
+
+
+		protected async Task<TResult> __RequestResponse<TMessage, TResult>(TMessage message, Func<TMessage, byte[]> intransform, Func<byte[], TResult> outtransform, ReadOnlySequence<byte> metadata = default, ReadOnlySequence<byte> tracing = default, string service = default, [CallerMemberName]string method = default) =>
+			outtransform((await __RequestResponse(new ReadOnlySequence<byte>(intransform(message)), metadata, tracing, service: service, method: method)).ToArray());
+
+		protected async Task<TResult> __RequestResponse<TMessage, TResult>(TMessage message, Func<TMessage, ReadOnlySequence<byte>> intransform, Func<ReadOnlySequence<byte>, TResult> outtransform, ReadOnlySequence<byte> metadata = default, ReadOnlySequence<byte> tracing = default, string service = default, [CallerMemberName]string method = default) =>
+			outtransform(await __RequestResponse(intransform(message), metadata, tracing, service: service, method: method));
 
-		protected async Task<ReadOnlySequence<byte>> __RequestResponse(string service, string method, ReadOnlySequence<byte> data, ReadOnlySequence<byte> metadata = default, ReadOnlySequence<byte> tracing = default)
+		protected async Task<ReadOnlySequence<byte>> __RequestResponse(ReadOnlySequence<byte> data, ReadOnlySequence<byte> metadata = default, ReadOnlySequence<byte> tracing = default, string service = default, [CallerMemberName]string method = default)
 		{
 			var receiver = new Receiver();
 			await Client.RequestResponse(receiver, data, new RemoteProcedureCall.RemoteProcedureCallMetadata(service, method, metadata, tracing));

RSocketRPCSample/EchoService.cs

@@ -30,7 +30,7 @@ public class EchoService : RSocketService<EchoService>, IEchoService
 		public EchoService(RSocketClient client) : base(client) { }
 
 		//TODO Consider CallerMemberName because the servicename is basically fixed. Also, consider static class...
-		public Task<BytesValue> requestResponse(BytesValue message, ReadOnlySequence<byte> metadata = default) => __RequestResponse(SERVICE, nameof(requestResponse), message, Google.Protobuf.MessageExtensions.ToByteArray, BytesValue.Parser.ParseFrom, metadata);
+		public Task<BytesValue> requestResponse(BytesValue message, ReadOnlySequence<byte> metadata = default) => __RequestResponse(message, Google.Protobuf.MessageExtensions.ToByteArray, BytesValue.Parser.ParseFrom, metadata, service: SERVICE);
 
 
 

RSocketRPCSample/SimpleService.cs

@@ -35,7 +35,7 @@ public class SimpleService : RSocketService<SimpleService>, ISimpleService
 
 		public SimpleService(RSocketClient client) : base(client) { }
 
-		public Task<SimpleResponse> RequestReply(SimpleRequest message, ReadOnlySequence<byte> metadata = default) => __RequestResponse(SERVICE, nameof(RequestReply), message, Google.Protobuf.MessageExtensions.ToByteArray, SimpleResponse.Parser.ParseFrom, metadata);
+		public Task<SimpleResponse> RequestReply(SimpleRequest message, ReadOnlySequence<byte> metadata = default) => __RequestResponse(message, Google.Protobuf.MessageExtensions.ToByteArray, SimpleResponse.Parser.ParseFrom, metadata, service: SERVICE);
 
 
 		//rpc RequestReply(SimpleRequest) returns(SimpleResponse) { }