Browse Source

Rename class

master
Savorboard 5 years ago
parent
commit
66b9eb9851
9 changed files with 23 additions and 23 deletions
  1. +3
    -3
      src/DotNetCore.CAP/CAP.ServiceCollectionExtensions.cs
  2. +1
    -1
      src/DotNetCore.CAP/Internal/ConsumerInvokerFactory.cs
  3. +4
    -4
      src/DotNetCore.CAP/Internal/IBootstrapper.Default.cs
  4. +3
    -3
      src/DotNetCore.CAP/Internal/IConsumerServiceSelector.Default.cs
  5. +3
    -3
      src/DotNetCore.CAP/Internal/ISubscribeDispatcher.Default.cs
  6. +4
    -4
      src/DotNetCore.CAP/Internal/ISubscribeInvoker.Default.cs
  7. +1
    -1
      test/DotNetCore.CAP.Test/ConsumerServiceSelectorTest.cs
  8. +1
    -1
      test/DotNetCore.CAP.Test/CustomConsumerSubscribeTest.cs
  9. +3
    -3
      test/DotNetCore.CAP.Test/SubscribeInvokerTest.cs

+ 3
- 3
src/DotNetCore.CAP/CAP.ServiceCollectionExtensions.cs View File

@@ -38,7 +38,7 @@ namespace Microsoft.Extensions.DependencyInjection

services.TryAddSingleton<ICapPublisher, CapPublisher>();

services.TryAddSingleton<IConsumerServiceSelector, DefaultConsumerServiceSelector>();
services.TryAddSingleton<IConsumerServiceSelector, ConsumerServiceSelector>();
services.TryAddSingleton<ISubscribeInvokerFactory, ConsumerInvokerFactory>();
services.TryAddSingleton<MethodMatcherCache>();

@@ -60,7 +60,7 @@ namespace Microsoft.Extensions.DependencyInjection
services.TryAddSingleton<ISerializer, JsonUtf8Serializer>();

// Warning: IPublishMessageSender need to inject at extension project.
services.TryAddSingleton<ISubscribeDispatcher, DefaultSubscribeDispatcher>();
services.TryAddSingleton<ISubscribeDispatcher, SubscribeDispatcher>();

//Options and extension service
var options = new CapOptions();
@@ -72,7 +72,7 @@ namespace Microsoft.Extensions.DependencyInjection
services.Configure(setupAction);

//Startup and Hosted
services.AddHostedService<DefaultBootstrapper>();
services.AddHostedService<Bootstrapper>();

return new CapBuilder(services);
}


+ 1
- 1
src/DotNetCore.CAP/Internal/ConsumerInvokerFactory.cs View File

@@ -21,7 +21,7 @@ namespace DotNetCore.CAP.Internal

public ISubscribeInvoker CreateInvoker()
{
return new DefaultSubscribeInvoker(_loggerFactory, _serviceProvider);
return new SubscribeInvoker(_loggerFactory, _serviceProvider);
}
}
}

+ 4
- 4
src/DotNetCore.CAP/Internal/IBootstrapper.Default.cs View File

@@ -14,12 +14,12 @@ namespace DotNetCore.CAP.Internal
/// <summary>
/// Default implement of <see cref="T:DotNetCore.CAP.Internal.IBootstrapper" />.
/// </summary>
internal class DefaultBootstrapper : BackgroundService, IBootstrapper
internal class Bootstrapper : BackgroundService, IBootstrapper
{
private readonly ILogger<DefaultBootstrapper> _logger;
private readonly ILogger<Bootstrapper> _logger;

public DefaultBootstrapper(
ILogger<DefaultBootstrapper> logger,
public Bootstrapper(
ILogger<Bootstrapper> logger,
IStorageInitializer storage,
IEnumerable<IProcessingServer> processors)
{


+ 3
- 3
src/DotNetCore.CAP/Internal/IConsumerServiceSelector.Default.cs View File

@@ -16,7 +16,7 @@ namespace DotNetCore.CAP.Internal
/// <summary>
/// A default <see cref="T:DotNetCore.CAP.Abstractions.IConsumerServiceSelector" /> implementation.
/// </summary>
public class DefaultConsumerServiceSelector : IConsumerServiceSelector
public class ConsumerServiceSelector : IConsumerServiceSelector
{
private readonly CapOptions _capOptions;
private readonly IServiceProvider _serviceProvider;
@@ -28,9 +28,9 @@ namespace DotNetCore.CAP.Internal
private readonly ConcurrentDictionary<string, List<RegexExecuteDescriptor<ConsumerExecutorDescriptor>>> _poundList;

/// <summary>
/// Creates a new <see cref="DefaultConsumerServiceSelector" />.
/// Creates a new <see cref="ConsumerServiceSelector" />.
/// </summary>
public DefaultConsumerServiceSelector(IServiceProvider serviceProvider)
public ConsumerServiceSelector(IServiceProvider serviceProvider)
{
_serviceProvider = serviceProvider;
_capOptions = serviceProvider.GetService<IOptions<CapOptions>>().Value;


+ 3
- 3
src/DotNetCore.CAP/Internal/ISubscribeDispatcher.Default.cs View File

@@ -17,7 +17,7 @@ using Microsoft.Extensions.Options;

namespace DotNetCore.CAP.Internal
{
internal class DefaultSubscribeDispatcher : ISubscribeDispatcher
internal class SubscribeDispatcher : ISubscribeDispatcher
{
private readonly IDataStorage _dataStorage;
private readonly ILogger _logger;
@@ -29,8 +29,8 @@ namespace DotNetCore.CAP.Internal
private static readonly DiagnosticListener s_diagnosticListener =
new DiagnosticListener(CapDiagnosticListenerNames.DiagnosticListenerName);

public DefaultSubscribeDispatcher(
ILogger<DefaultSubscribeDispatcher> logger,
public SubscribeDispatcher(
ILogger<SubscribeDispatcher> logger,
IOptions<CapOptions> options,
IServiceProvider provider)
{


+ 4
- 4
src/DotNetCore.CAP/Internal/ISubscribeInvoker.Default.cs View File

@@ -12,15 +12,15 @@ using Microsoft.Extensions.Logging;

namespace DotNetCore.CAP.Internal
{
internal class DefaultSubscribeInvoker : ISubscribeInvoker
internal class SubscribeInvoker : ISubscribeInvoker
{
private readonly ILogger _logger;
private readonly IServiceProvider _serviceProvider;

public DefaultSubscribeInvoker(ILoggerFactory loggerFactory, IServiceProvider serviceProvider)
public SubscribeInvoker(ILoggerFactory loggerFactory, IServiceProvider serviceProvider)
{
_serviceProvider = serviceProvider;
_logger = loggerFactory.CreateLogger<DefaultSubscribeInvoker>();
_logger = loggerFactory.CreateLogger<SubscribeInvoker>();
}

public async Task<ConsumerExecutedResult> InvokeAsync(ConsumerContext context, CancellationToken cancellationToken = default)
@@ -30,7 +30,7 @@ namespace DotNetCore.CAP.Internal
_logger.LogDebug("Executing subscriber method : {0}", context.ConsumerDescriptor.MethodInfo.Name);

var executor = ObjectMethodExecutor.Create(
context.ConsumerDescriptor.MethodInfo,
context.ConsumerDescriptor.MethodInfo,
context.ConsumerDescriptor.ImplTypeInfo);

using (var scope = _serviceProvider.CreateScope())


+ 1
- 1
test/DotNetCore.CAP.Test/ConsumerServiceSelectorTest.cs View File

@@ -16,7 +16,7 @@ namespace DotNetCore.CAP.Test
ServiceCollectionExtensions.ServiceCollection = services;
services.AddOptions();
services.PostConfigure<CapOptions>(x=>{});
services.AddSingleton<IConsumerServiceSelector, DefaultConsumerServiceSelector>();
services.AddSingleton<IConsumerServiceSelector, ConsumerServiceSelector>();
services.AddScoped<IFooTest, CandidatesFooTest>();
services.AddScoped<IBarTest, CandidatesBarTest>();
services.AddLogging();


+ 1
- 1
test/DotNetCore.CAP.Test/CustomConsumerSubscribeTest.cs View File

@@ -46,7 +46,7 @@ namespace DotNetCore.CAP.Test
}
}

public class MyConsumerServiceSelector : DefaultConsumerServiceSelector
public class MyConsumerServiceSelector : ConsumerServiceSelector
{
private readonly CapOptions _capOptions;



test/DotNetCore.CAP.Test/ConsumerInvokerTest.cs → test/DotNetCore.CAP.Test/SubscribeInvokerTest.cs View File

@@ -9,15 +9,15 @@ using Xunit;

namespace DotNetCore.CAP.Test
{
public class ConsumerInvokerTest
public class SubscribeInvokerTest
{
private readonly IServiceProvider _serviceProvider;

public ConsumerInvokerTest()
public SubscribeInvokerTest()
{
var serviceCollection = new ServiceCollection();
serviceCollection.AddLogging();
serviceCollection.AddSingleton<ISubscribeInvoker, DefaultSubscribeInvoker>();
serviceCollection.AddSingleton<ISubscribeInvoker, SubscribeInvoker>();
_serviceProvider = serviceCollection.BuildServiceProvider();
}


Loading…
Cancel
Save