reformatted all code to .NET standard formatting

1 files changed, 89 insertions, 71 deletions

diff --git a/src/ProtocolBuffers.Test/TestRpcGenerator.cs b/src/ProtocolBuffers.Test/TestRpcGenerator.cs
index ac98c496..5f159b62 100644
--- a/src/ProtocolBuffers.Test/TestRpcGenerator.cs
+++ b/src/ProtocolBuffers.Test/TestRpcGenerator.cs
@@ -1,4 +1,5 @@
-#region Copyright notice and license

+#region Copyright notice and license

+

 // Protocol Buffers - Google's data interchange format

 // Copyright 2008 Google Inc.  All rights reserved.

 // http://github.com/jskeet/dotnet-protobufs/

@@ -30,6 +31,7 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+

 #endregion

 

 using System;

@@ -46,81 +48,95 @@ namespace Google.ProtocolBuffers
     [TestFixture]

     public class TestRpcGenerator

     {

-      /// <summary>

-      /// A sample implementation of the ISearchService for testing

-      /// </summary>

-      class ExampleSearchImpl : ISearchService {

-        SearchResponse ISearchService.Search(SearchRequest searchRequest) {

-            if (searchRequest.CriteriaCount == 0) {

-              throw new ArgumentException("No criteria specified.", new InvalidOperationException());

+        /// <summary>

+        /// A sample implementation of the ISearchService for testing

+        /// </summary>

+        private class ExampleSearchImpl : ISearchService

+        {

+            SearchResponse ISearchService.Search(SearchRequest searchRequest)

+            {

+                if (searchRequest.CriteriaCount == 0)

+                {

+                    throw new ArgumentException("No criteria specified.", new InvalidOperationException());

+                }

+                SearchResponse.Builder resp = SearchResponse.CreateBuilder();

+                foreach (string criteria in searchRequest.CriteriaList)

+                {

+                    resp.AddResults(

+                        SearchResponse.Types.ResultItem.CreateBuilder().SetName(criteria).SetUrl("http://search.com").

+                            Build());

+                }

+                return resp.Build();

+            }

+

+            SearchResponse ISearchService.RefineSearch(RefineSearchRequest refineSearchRequest)

+            {

+                SearchResponse.Builder resp = refineSearchRequest.PreviousResults.ToBuilder();

+                foreach (string criteria in refineSearchRequest.CriteriaList)

+                {

+                    resp.AddResults(

+                        SearchResponse.Types.ResultItem.CreateBuilder().SetName(criteria).SetUrl("http://refine.com").

+                            Build());

+                }

+                return resp.Build();

+            }

+        }

+

+        /// <summary>

+        /// An example extraction of the wire protocol

+        /// </summary>

+        private interface IWireTransfer

+        {

+            byte[] Execute(string method, byte[] message);

+        }

+

+        /// <summary>

+        /// An example of a server responding to a wire request

+        /// </summary>

+        private class ExampleServerHost : IWireTransfer

+        {

+            private readonly IRpcServerStub _stub;

+

+            public ExampleServerHost(ISearchService implementation)

+            {

+                //on the server, we create a dispatch to call the appropriate method by name

+                IRpcDispatch dispatch = new SearchService.Dispatch(implementation);

+                //we then wrap that dispatch in a server stub which will deserialize the wire bytes to the message

+                //type appropriate for the method name being invoked.

+                _stub = new SearchService.ServerStub(dispatch);

             }

-            SearchResponse.Builder resp = SearchResponse.CreateBuilder();

-            foreach (string criteria in searchRequest.CriteriaList) {

-              resp.AddResults(SearchResponse.Types.ResultItem.CreateBuilder().SetName(criteria).SetUrl("http://search.com").Build());

+

+            byte[] IWireTransfer.Execute(string method, byte[] message)

+            {

+                //now when we recieve a wire transmission to invoke a method by name with a byte[] or stream payload

+                //we just simply call the sub:

+                IMessageLite response = _stub.CallMethod(method, CodedInputStream.CreateInstance(message),

+                                                         ExtensionRegistry.Empty);

+                //now we return the expected response message:

+                return response.ToByteArray();

             }

-            return resp.Build();

         }

 

-        SearchResponse ISearchService.RefineSearch(RefineSearchRequest refineSearchRequest) {

-            SearchResponse.Builder resp = refineSearchRequest.PreviousResults.ToBuilder();

-            foreach (string criteria in refineSearchRequest.CriteriaList) {

-              resp.AddResults(SearchResponse.Types.ResultItem.CreateBuilder().SetName(criteria).SetUrl("http://refine.com").Build());

+        /// <summary>

+        /// An example of a client sending a wire request

+        /// </summary>

+        private class ExampleClient : IRpcDispatch

+        {

+            private readonly IWireTransfer _wire;

+

+            public ExampleClient(IWireTransfer wire)

+            {

+                _wire = wire;

+            }

+

+            TMessage IRpcDispatch.CallMethod<TMessage, TBuilder>(string method, IMessageLite request,

+                                                                 IBuilderLite<TMessage, TBuilder> response)

+            {

+                byte[] rawResponse = _wire.Execute(method, request.ToByteArray());

+                response.MergeFrom(rawResponse);

+                return response.Build();

             }

-            return resp.Build();

         }

-      }

-

-      /// <summary>

-      /// An example extraction of the wire protocol

-      /// </summary>

-      interface IWireTransfer 

-      {

-          byte[] Execute(string method, byte[] message);

-      }

-

-      /// <summary>

-      /// An example of a server responding to a wire request

-      /// </summary>

-      class ExampleServerHost : IWireTransfer

-      {

-          readonly IRpcServerStub _stub;

-          public ExampleServerHost(ISearchService implementation)

-          {

-              //on the server, we create a dispatch to call the appropriate method by name

-              IRpcDispatch dispatch = new SearchService.Dispatch(implementation);

-              //we then wrap that dispatch in a server stub which will deserialize the wire bytes to the message

-              //type appropriate for the method name being invoked.

-              _stub = new SearchService.ServerStub(dispatch);

-          }

-

-          byte[] IWireTransfer.Execute(string method, byte[] message)

-          {

-              //now when we recieve a wire transmission to invoke a method by name with a byte[] or stream payload

-              //we just simply call the sub:

-              IMessageLite response = _stub.CallMethod(method, CodedInputStream.CreateInstance(message), ExtensionRegistry.Empty);

-              //now we return the expected response message:

-              return response.ToByteArray();

-          }

-      }

-

-      /// <summary>

-      /// An example of a client sending a wire request

-      /// </summary>

-      class ExampleClient : IRpcDispatch

-      {

-          readonly IWireTransfer _wire;

-          public ExampleClient(IWireTransfer wire)

-          {

-              _wire = wire;

-          }

-

-          TMessage IRpcDispatch.CallMethod<TMessage, TBuilder>(string method, IMessageLite request, IBuilderLite<TMessage, TBuilder> response)

-          {

-              byte[] rawResponse = _wire.Execute(method, request.ToByteArray());

-              response.MergeFrom(rawResponse);

-              return response.Build();

-          }

-      }

 

         /// <summary>

         /// Put it all together to create one seamless client/server experience full of rich-type goodness ;)

@@ -141,7 +157,9 @@ namespace Google.ProtocolBuffers
             Assert.AreEqual("http://search.com", result.ResultsList[0].Url);

 

             //The test part of this, call the only other method

-            result = client.RefineSearch(RefineSearchRequest.CreateBuilder().SetPreviousResults(result).AddCriteria("Refine").Build());

+            result =

+                client.RefineSearch(

+                    RefineSearchRequest.CreateBuilder().SetPreviousResults(result).AddCriteria("Refine").Build());

             Assert.AreEqual(2, result.ResultsCount);

             Assert.AreEqual("Test", result.ResultsList[0].Name);

             Assert.AreEqual("http://search.com", result.ResultsList[0].Url);