From 32cfa4e787b6b9abab9b28b6f530a76afcb82e89 Mon Sep 17 00:00:00 2001
From: Savorboard <yangxiaodong1214@126.com>
Date: Sun, 22 Oct 2017 15:21:54 +0800
Subject: [PATCH] modify class protected level

---
 src/DotNetCore.CAP/Internal/ConsumerContext.cs        |  2 +-
 src/DotNetCore.CAP/Internal/ConsumerExecutedResult.cs |  2 +-
 .../Internal/ConsumerExecutorDescriptor.cs            |  2 +-
 src/DotNetCore.CAP/Internal/ConsumerInvokerFactory.cs |  2 +-
 src/DotNetCore.CAP/Internal/ICallbackMessageSender.cs |  2 +-
 .../Internal/IConsumerInvoker.Default.cs              |  2 +-
 src/DotNetCore.CAP/Internal/IConsumerInvoker.cs       |  3 +--
 .../Internal/IConsumerInvokerFactory.cs               |  2 +-
 .../Internal/IConsumerServiceSelector.Default.cs      |  2 +-
 .../Internal/IConsumerServiceSelector.cs              |  2 +-
 .../Internal/IContentSerializer.Json.cs               | 10 ++++++++--
 src/DotNetCore.CAP/Internal/IMessagePacker.Default.cs |  2 +-
 .../Internal/IModelBinder.SimpleType.cs               |  2 +-
 .../Internal/ISubscriberExecutor.Default.cs           | 11 ++++++-----
 src/DotNetCore.CAP/Internal/MethodMatcherCache.cs     |  2 +-
 15 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/DotNetCore.CAP/Internal/ConsumerContext.cs b/src/DotNetCore.CAP/Internal/ConsumerContext.cs
index 13a75ab..288b629 100644
--- a/src/DotNetCore.CAP/Internal/ConsumerContext.cs
+++ b/src/DotNetCore.CAP/Internal/ConsumerContext.cs
@@ -5,7 +5,7 @@ namespace DotNetCore.CAP.Internal
     /// <summary>
     /// A context for consumers, it used to be provider wrapper of method description and received message.
     /// </summary>
-    public class ConsumerContext
+    internal class ConsumerContext
     {
         /// <summary>
         /// create a new instance of  <see cref="ConsumerContext" /> .
diff --git a/src/DotNetCore.CAP/Internal/ConsumerExecutedResult.cs b/src/DotNetCore.CAP/Internal/ConsumerExecutedResult.cs
index e29c0db..093fbb3 100644
--- a/src/DotNetCore.CAP/Internal/ConsumerExecutedResult.cs
+++ b/src/DotNetCore.CAP/Internal/ConsumerExecutedResult.cs
@@ -4,7 +4,7 @@ using System.Text;
 
 namespace DotNetCore.CAP.Internal
 {
-    public class ConsumerExecutedResult
+    internal class ConsumerExecutedResult
     {
         public ConsumerExecutedResult(object result, string msgId, string callbackName)
         {
diff --git a/src/DotNetCore.CAP/Internal/ConsumerExecutorDescriptor.cs b/src/DotNetCore.CAP/Internal/ConsumerExecutorDescriptor.cs
index a7186e8..b69f394 100644
--- a/src/DotNetCore.CAP/Internal/ConsumerExecutorDescriptor.cs
+++ b/src/DotNetCore.CAP/Internal/ConsumerExecutorDescriptor.cs
@@ -6,7 +6,7 @@ namespace DotNetCore.CAP.Internal
     /// <summary>
     /// A descriptor of user definition method.
     /// </summary>
-    public class ConsumerExecutorDescriptor
+    internal class ConsumerExecutorDescriptor
     {
         public MethodInfo MethodInfo { get; set; }
 
diff --git a/src/DotNetCore.CAP/Internal/ConsumerInvokerFactory.cs b/src/DotNetCore.CAP/Internal/ConsumerInvokerFactory.cs
index d945590..c6eb9e0 100644
--- a/src/DotNetCore.CAP/Internal/ConsumerInvokerFactory.cs
+++ b/src/DotNetCore.CAP/Internal/ConsumerInvokerFactory.cs
@@ -4,7 +4,7 @@ using Microsoft.Extensions.Logging;
 
 namespace DotNetCore.CAP.Internal
 {
-    public class ConsumerInvokerFactory : IConsumerInvokerFactory
+    internal class ConsumerInvokerFactory : IConsumerInvokerFactory
     {
         private readonly ILogger _logger;
         private readonly IMessagePacker _messagePacker;
diff --git a/src/DotNetCore.CAP/Internal/ICallbackMessageSender.cs b/src/DotNetCore.CAP/Internal/ICallbackMessageSender.cs
index f10178f..2f7d3e6 100644
--- a/src/DotNetCore.CAP/Internal/ICallbackMessageSender.cs
+++ b/src/DotNetCore.CAP/Internal/ICallbackMessageSender.cs
@@ -2,7 +2,7 @@
 
 namespace DotNetCore.CAP.Internal
 {
-    public interface ICallbackMessageSender
+    internal interface ICallbackMessageSender
     {
         Task SendAsync(string messageId, string topicName, object bodyObj);
     }
diff --git a/src/DotNetCore.CAP/Internal/IConsumerInvoker.Default.cs b/src/DotNetCore.CAP/Internal/IConsumerInvoker.Default.cs
index 4853009..7303f80 100644
--- a/src/DotNetCore.CAP/Internal/IConsumerInvoker.Default.cs
+++ b/src/DotNetCore.CAP/Internal/IConsumerInvoker.Default.cs
@@ -7,7 +7,7 @@ using Microsoft.Extensions.Logging;
 
 namespace DotNetCore.CAP.Internal
 {
-    public class DefaultConsumerInvoker : IConsumerInvoker
+    internal class DefaultConsumerInvoker : IConsumerInvoker
     {
         private readonly ILogger _logger;
         private readonly IModelBinderFactory _modelBinderFactory;
diff --git a/src/DotNetCore.CAP/Internal/IConsumerInvoker.cs b/src/DotNetCore.CAP/Internal/IConsumerInvoker.cs
index 169ca3e..13c7964 100644
--- a/src/DotNetCore.CAP/Internal/IConsumerInvoker.cs
+++ b/src/DotNetCore.CAP/Internal/IConsumerInvoker.cs
@@ -1,12 +1,11 @@
 using System.Threading.Tasks;
-using DotNetCore.CAP.Abstractions;
 
 namespace DotNetCore.CAP.Internal
 {
     /// <summary>
     /// Perform user definition method of consumers.
     /// </summary>
-    public interface IConsumerInvoker
+    internal interface IConsumerInvoker
     {
         /// <summary>
         /// Invoke consumer method whit consumer context.
diff --git a/src/DotNetCore.CAP/Internal/IConsumerInvokerFactory.cs b/src/DotNetCore.CAP/Internal/IConsumerInvokerFactory.cs
index 106c788..44d38d5 100644
--- a/src/DotNetCore.CAP/Internal/IConsumerInvokerFactory.cs
+++ b/src/DotNetCore.CAP/Internal/IConsumerInvokerFactory.cs
@@ -1,6 +1,6 @@
 namespace DotNetCore.CAP.Internal
 {
-    public interface IConsumerInvokerFactory
+    internal interface IConsumerInvokerFactory
     {
         IConsumerInvoker CreateInvoker();
     }
diff --git a/src/DotNetCore.CAP/Internal/IConsumerServiceSelector.Default.cs b/src/DotNetCore.CAP/Internal/IConsumerServiceSelector.Default.cs
index 8ccb9eb..1d23740 100644
--- a/src/DotNetCore.CAP/Internal/IConsumerServiceSelector.Default.cs
+++ b/src/DotNetCore.CAP/Internal/IConsumerServiceSelector.Default.cs
@@ -12,7 +12,7 @@ namespace DotNetCore.CAP.Internal
     /// <summary>
     /// A default <see cref="T:DotNetCore.CAP.Abstractions.IConsumerServiceSelector" /> implementation.
     /// </summary>
-    public class DefaultConsumerServiceSelector : IConsumerServiceSelector
+    internal class DefaultConsumerServiceSelector : IConsumerServiceSelector
     {
         private readonly IServiceProvider _serviceProvider;
 
diff --git a/src/DotNetCore.CAP/Internal/IConsumerServiceSelector.cs b/src/DotNetCore.CAP/Internal/IConsumerServiceSelector.cs
index 2f4092e..3944d79 100644
--- a/src/DotNetCore.CAP/Internal/IConsumerServiceSelector.cs
+++ b/src/DotNetCore.CAP/Internal/IConsumerServiceSelector.cs
@@ -5,7 +5,7 @@ namespace DotNetCore.CAP.Internal
     /// <summary>
     /// Defines an interface for selecting an consumer service method to invoke for the current message.
     /// </summary>
-    public interface IConsumerServiceSelector
+    internal interface IConsumerServiceSelector
     {
         /// <summary>
         /// Selects a set of <see cref="ConsumerExecutorDescriptor" /> candidates for the current message associated with
diff --git a/src/DotNetCore.CAP/Internal/IContentSerializer.Json.cs b/src/DotNetCore.CAP/Internal/IContentSerializer.Json.cs
index d82a9dc..21b656d 100644
--- a/src/DotNetCore.CAP/Internal/IContentSerializer.Json.cs
+++ b/src/DotNetCore.CAP/Internal/IContentSerializer.Json.cs
@@ -1,15 +1,21 @@
-using DotNetCore.CAP.Abstractions;
+using System;
+using DotNetCore.CAP.Abstractions;
 using DotNetCore.CAP.Infrastructure;
 
 namespace DotNetCore.CAP.Internal
 {
-    public class JsonContentSerializer : IContentSerializer
+    internal class JsonContentSerializer : IContentSerializer
     {
         public T DeSerialize<T>(string messageObjStr) 
         {
             return Helper.FromJson<T>(messageObjStr);
         }
 
+        public object DeSerialize(string content, Type type)
+        {
+            return Helper.FromJson(content, type);
+        }
+
         public string Serialize<T>(T messageObj)
         {
             return Helper.ToJson(messageObj);
diff --git a/src/DotNetCore.CAP/Internal/IMessagePacker.Default.cs b/src/DotNetCore.CAP/Internal/IMessagePacker.Default.cs
index 1f7e976..ea333fa 100644
--- a/src/DotNetCore.CAP/Internal/IMessagePacker.Default.cs
+++ b/src/DotNetCore.CAP/Internal/IMessagePacker.Default.cs
@@ -3,7 +3,7 @@ using DotNetCore.CAP.Models;
 
 namespace DotNetCore.CAP.Internal
 {
-    public class DefaultMessagePacker : IMessagePacker
+    internal class DefaultMessagePacker : IMessagePacker
     {
         private readonly IContentSerializer _serializer;
 
diff --git a/src/DotNetCore.CAP/Internal/IModelBinder.SimpleType.cs b/src/DotNetCore.CAP/Internal/IModelBinder.SimpleType.cs
index 54693b1..c6f6c80 100644
--- a/src/DotNetCore.CAP/Internal/IModelBinder.SimpleType.cs
+++ b/src/DotNetCore.CAP/Internal/IModelBinder.SimpleType.cs
@@ -8,7 +8,7 @@ using DotNetCore.CAP.Abstractions.ModelBinding;
 
 namespace DotNetCore.CAP.Internal
 {
-    public class SimpleTypeModelBinder : IModelBinder
+    internal class SimpleTypeModelBinder : IModelBinder
     {
         private readonly ParameterInfo _parameterInfo;
         private readonly TypeConverter _typeConverter;
diff --git a/src/DotNetCore.CAP/Internal/ISubscriberExecutor.Default.cs b/src/DotNetCore.CAP/Internal/ISubscriberExecutor.Default.cs
index 579e009..222a89b 100644
--- a/src/DotNetCore.CAP/Internal/ISubscriberExecutor.Default.cs
+++ b/src/DotNetCore.CAP/Internal/ISubscriberExecutor.Default.cs
@@ -1,11 +1,12 @@
 using System;
 using System.Threading.Tasks;
+using DotNetCore.CAP.Abstractions;
 using DotNetCore.CAP.Models;
 using Microsoft.Extensions.Logging;
 
 namespace DotNetCore.CAP.Internal
 {
-    public class DefaultSubscriberExecutor : ISubscriberExecutor
+    internal class DefaultSubscriberExecutor : ISubscriberExecutor
     {
         private readonly ICallbackMessageSender _callbackMessageSender;
         private readonly ILogger<DefaultSubscriberExecutor> _logger;
@@ -41,11 +42,11 @@ namespace DotNetCore.CAP.Internal
                 var executeDescriptor = executeDescriptorGroup[receivedMessage.Group][0];
                 var consumerContext = new ConsumerContext(executeDescriptor, receivedMessage.ToMessageContext());
 
-                var ret  = await Invoker.InvokeAsync(consumerContext);
+                var ret = await Invoker.InvokeAsync(consumerContext);
+
+                if (!string.IsNullOrEmpty(ret.CallbackName))
+                    await _callbackMessageSender.SendAsync(ret.MessageId, ret.CallbackName, ret.Result);
 
-                if (!string.IsNullOrEmpty(ret.CallbackName)) 
-                   await  _callbackMessageSender.SendAsync(ret.MessageId,ret.CallbackName,ret.Result);
-                
                 return OperateResult.Success;
             }
             catch (Exception ex)
diff --git a/src/DotNetCore.CAP/Internal/MethodMatcherCache.cs b/src/DotNetCore.CAP/Internal/MethodMatcherCache.cs
index fe7f468..4e861a7 100644
--- a/src/DotNetCore.CAP/Internal/MethodMatcherCache.cs
+++ b/src/DotNetCore.CAP/Internal/MethodMatcherCache.cs
@@ -6,7 +6,7 @@ using DotNetCore.CAP.Abstractions;
 
 namespace DotNetCore.CAP.Internal
 {
-    public class MethodMatcherCache
+    internal class MethodMatcherCache
     {
         private readonly IConsumerServiceSelector _selector;