Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
CAP
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
tsai
CAP
Commits
66b9eb98
Commit
66b9eb98
authored
Nov 28, 2019
by
Savorboard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename class
parent
5d7c7796
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
23 additions
and
23 deletions
+23
-23
CAP.ServiceCollectionExtensions.cs
src/DotNetCore.CAP/CAP.ServiceCollectionExtensions.cs
+3
-3
ConsumerInvokerFactory.cs
src/DotNetCore.CAP/Internal/ConsumerInvokerFactory.cs
+1
-1
IBootstrapper.Default.cs
src/DotNetCore.CAP/Internal/IBootstrapper.Default.cs
+4
-4
IConsumerServiceSelector.Default.cs
...tNetCore.CAP/Internal/IConsumerServiceSelector.Default.cs
+3
-3
ISubscribeDispatcher.Default.cs
src/DotNetCore.CAP/Internal/ISubscribeDispatcher.Default.cs
+3
-3
ISubscribeInvoker.Default.cs
src/DotNetCore.CAP/Internal/ISubscribeInvoker.Default.cs
+4
-4
ConsumerServiceSelectorTest.cs
test/DotNetCore.CAP.Test/ConsumerServiceSelectorTest.cs
+1
-1
CustomConsumerSubscribeTest.cs
test/DotNetCore.CAP.Test/CustomConsumerSubscribeTest.cs
+1
-1
SubscribeInvokerTest.cs
test/DotNetCore.CAP.Test/SubscribeInvokerTest.cs
+3
-3
No files found.
src/DotNetCore.CAP/CAP.ServiceCollectionExtensions.cs
View file @
66b9eb98
...
@@ -38,7 +38,7 @@ namespace Microsoft.Extensions.DependencyInjection
...
@@ -38,7 +38,7 @@ namespace Microsoft.Extensions.DependencyInjection
services
.
TryAddSingleton
<
ICapPublisher
,
CapPublisher
>();
services
.
TryAddSingleton
<
ICapPublisher
,
CapPublisher
>();
services
.
TryAddSingleton
<
IConsumerServiceSelector
,
Default
ConsumerServiceSelector
>();
services
.
TryAddSingleton
<
IConsumerServiceSelector
,
ConsumerServiceSelector
>();
services
.
TryAddSingleton
<
ISubscribeInvokerFactory
,
ConsumerInvokerFactory
>();
services
.
TryAddSingleton
<
ISubscribeInvokerFactory
,
ConsumerInvokerFactory
>();
services
.
TryAddSingleton
<
MethodMatcherCache
>();
services
.
TryAddSingleton
<
MethodMatcherCache
>();
...
@@ -60,7 +60,7 @@ namespace Microsoft.Extensions.DependencyInjection
...
@@ -60,7 +60,7 @@ namespace Microsoft.Extensions.DependencyInjection
services
.
TryAddSingleton
<
ISerializer
,
JsonUtf8Serializer
>();
services
.
TryAddSingleton
<
ISerializer
,
JsonUtf8Serializer
>();
// Warning: IPublishMessageSender need to inject at extension project.
// Warning: IPublishMessageSender need to inject at extension project.
services
.
TryAddSingleton
<
ISubscribeDispatcher
,
Default
SubscribeDispatcher
>();
services
.
TryAddSingleton
<
ISubscribeDispatcher
,
SubscribeDispatcher
>();
//Options and extension service
//Options and extension service
var
options
=
new
CapOptions
();
var
options
=
new
CapOptions
();
...
@@ -72,7 +72,7 @@ namespace Microsoft.Extensions.DependencyInjection
...
@@ -72,7 +72,7 @@ namespace Microsoft.Extensions.DependencyInjection
services
.
Configure
(
setupAction
);
services
.
Configure
(
setupAction
);
//Startup and Hosted
//Startup and Hosted
services
.
AddHostedService
<
Default
Bootstrapper
>();
services
.
AddHostedService
<
Bootstrapper
>();
return
new
CapBuilder
(
services
);
return
new
CapBuilder
(
services
);
}
}
...
...
src/DotNetCore.CAP/Internal/ConsumerInvokerFactory.cs
View file @
66b9eb98
...
@@ -21,7 +21,7 @@ namespace DotNetCore.CAP.Internal
...
@@ -21,7 +21,7 @@ namespace DotNetCore.CAP.Internal
public
ISubscribeInvoker
CreateInvoker
()
public
ISubscribeInvoker
CreateInvoker
()
{
{
return
new
Default
SubscribeInvoker
(
_loggerFactory
,
_serviceProvider
);
return
new
SubscribeInvoker
(
_loggerFactory
,
_serviceProvider
);
}
}
}
}
}
}
\ No newline at end of file
src/DotNetCore.CAP/Internal/IBootstrapper.Default.cs
View file @
66b9eb98
...
@@ -14,12 +14,12 @@ namespace DotNetCore.CAP.Internal
...
@@ -14,12 +14,12 @@ namespace DotNetCore.CAP.Internal
/// <summary>
/// <summary>
/// Default implement of <see cref="T:DotNetCore.CAP.Internal.IBootstrapper" />.
/// Default implement of <see cref="T:DotNetCore.CAP.Internal.IBootstrapper" />.
/// </summary>
/// </summary>
internal
class
Default
Bootstrapper
:
BackgroundService
,
IBootstrapper
internal
class
Bootstrapper
:
BackgroundService
,
IBootstrapper
{
{
private
readonly
ILogger
<
Default
Bootstrapper
>
_logger
;
private
readonly
ILogger
<
Bootstrapper
>
_logger
;
public
Default
Bootstrapper
(
public
Bootstrapper
(
ILogger
<
Default
Bootstrapper
>
logger
,
ILogger
<
Bootstrapper
>
logger
,
IStorageInitializer
storage
,
IStorageInitializer
storage
,
IEnumerable
<
IProcessingServer
>
processors
)
IEnumerable
<
IProcessingServer
>
processors
)
{
{
...
...
src/DotNetCore.CAP/Internal/IConsumerServiceSelector.Default.cs
View file @
66b9eb98
...
@@ -16,7 +16,7 @@ namespace DotNetCore.CAP.Internal
...
@@ -16,7 +16,7 @@ namespace DotNetCore.CAP.Internal
/// <summary>
/// <summary>
/// A default <see cref="T:DotNetCore.CAP.Abstractions.IConsumerServiceSelector" /> implementation.
/// A default <see cref="T:DotNetCore.CAP.Abstractions.IConsumerServiceSelector" /> implementation.
/// </summary>
/// </summary>
public
class
Default
ConsumerServiceSelector
:
IConsumerServiceSelector
public
class
ConsumerServiceSelector
:
IConsumerServiceSelector
{
{
private
readonly
CapOptions
_capOptions
;
private
readonly
CapOptions
_capOptions
;
private
readonly
IServiceProvider
_serviceProvider
;
private
readonly
IServiceProvider
_serviceProvider
;
...
@@ -28,9 +28,9 @@ namespace DotNetCore.CAP.Internal
...
@@ -28,9 +28,9 @@ namespace DotNetCore.CAP.Internal
private
readonly
ConcurrentDictionary
<
string
,
List
<
RegexExecuteDescriptor
<
ConsumerExecutorDescriptor
>>>
_poundList
;
private
readonly
ConcurrentDictionary
<
string
,
List
<
RegexExecuteDescriptor
<
ConsumerExecutorDescriptor
>>>
_poundList
;
/// <summary>
/// <summary>
/// Creates a new <see cref="
Default
ConsumerServiceSelector" />.
/// Creates a new <see cref="ConsumerServiceSelector" />.
/// </summary>
/// </summary>
public
Default
ConsumerServiceSelector
(
IServiceProvider
serviceProvider
)
public
ConsumerServiceSelector
(
IServiceProvider
serviceProvider
)
{
{
_serviceProvider
=
serviceProvider
;
_serviceProvider
=
serviceProvider
;
_capOptions
=
serviceProvider
.
GetService
<
IOptions
<
CapOptions
>>().
Value
;
_capOptions
=
serviceProvider
.
GetService
<
IOptions
<
CapOptions
>>().
Value
;
...
...
src/DotNetCore.CAP/Internal/ISubscribeDispatcher.Default.cs
View file @
66b9eb98
...
@@ -17,7 +17,7 @@ using Microsoft.Extensions.Options;
...
@@ -17,7 +17,7 @@ using Microsoft.Extensions.Options;
namespace
DotNetCore.CAP.Internal
namespace
DotNetCore.CAP.Internal
{
{
internal
class
Default
SubscribeDispatcher
:
ISubscribeDispatcher
internal
class
SubscribeDispatcher
:
ISubscribeDispatcher
{
{
private
readonly
IDataStorage
_dataStorage
;
private
readonly
IDataStorage
_dataStorage
;
private
readonly
ILogger
_logger
;
private
readonly
ILogger
_logger
;
...
@@ -29,8 +29,8 @@ namespace DotNetCore.CAP.Internal
...
@@ -29,8 +29,8 @@ namespace DotNetCore.CAP.Internal
private
static
readonly
DiagnosticListener
s_diagnosticListener
=
private
static
readonly
DiagnosticListener
s_diagnosticListener
=
new
DiagnosticListener
(
CapDiagnosticListenerNames
.
DiagnosticListenerName
);
new
DiagnosticListener
(
CapDiagnosticListenerNames
.
DiagnosticListenerName
);
public
Default
SubscribeDispatcher
(
public
SubscribeDispatcher
(
ILogger
<
Default
SubscribeDispatcher
>
logger
,
ILogger
<
SubscribeDispatcher
>
logger
,
IOptions
<
CapOptions
>
options
,
IOptions
<
CapOptions
>
options
,
IServiceProvider
provider
)
IServiceProvider
provider
)
{
{
...
...
src/DotNetCore.CAP/Internal/ISubscribeInvoker.Default.cs
View file @
66b9eb98
...
@@ -12,15 +12,15 @@ using Microsoft.Extensions.Logging;
...
@@ -12,15 +12,15 @@ using Microsoft.Extensions.Logging;
namespace
DotNetCore.CAP.Internal
namespace
DotNetCore.CAP.Internal
{
{
internal
class
Default
SubscribeInvoker
:
ISubscribeInvoker
internal
class
SubscribeInvoker
:
ISubscribeInvoker
{
{
private
readonly
ILogger
_logger
;
private
readonly
ILogger
_logger
;
private
readonly
IServiceProvider
_serviceProvider
;
private
readonly
IServiceProvider
_serviceProvider
;
public
Default
SubscribeInvoker
(
ILoggerFactory
loggerFactory
,
IServiceProvider
serviceProvider
)
public
SubscribeInvoker
(
ILoggerFactory
loggerFactory
,
IServiceProvider
serviceProvider
)
{
{
_serviceProvider
=
serviceProvider
;
_serviceProvider
=
serviceProvider
;
_logger
=
loggerFactory
.
CreateLogger
<
Default
SubscribeInvoker
>();
_logger
=
loggerFactory
.
CreateLogger
<
SubscribeInvoker
>();
}
}
public
async
Task
<
ConsumerExecutedResult
>
InvokeAsync
(
ConsumerContext
context
,
CancellationToken
cancellationToken
=
default
)
public
async
Task
<
ConsumerExecutedResult
>
InvokeAsync
(
ConsumerContext
context
,
CancellationToken
cancellationToken
=
default
)
...
@@ -30,7 +30,7 @@ namespace DotNetCore.CAP.Internal
...
@@ -30,7 +30,7 @@ namespace DotNetCore.CAP.Internal
_logger
.
LogDebug
(
"Executing subscriber method : {0}"
,
context
.
ConsumerDescriptor
.
MethodInfo
.
Name
);
_logger
.
LogDebug
(
"Executing subscriber method : {0}"
,
context
.
ConsumerDescriptor
.
MethodInfo
.
Name
);
var
executor
=
ObjectMethodExecutor
.
Create
(
var
executor
=
ObjectMethodExecutor
.
Create
(
context
.
ConsumerDescriptor
.
MethodInfo
,
context
.
ConsumerDescriptor
.
MethodInfo
,
context
.
ConsumerDescriptor
.
ImplTypeInfo
);
context
.
ConsumerDescriptor
.
ImplTypeInfo
);
using
(
var
scope
=
_serviceProvider
.
CreateScope
())
using
(
var
scope
=
_serviceProvider
.
CreateScope
())
...
...
test/DotNetCore.CAP.Test/ConsumerServiceSelectorTest.cs
View file @
66b9eb98
...
@@ -16,7 +16,7 @@ namespace DotNetCore.CAP.Test
...
@@ -16,7 +16,7 @@ namespace DotNetCore.CAP.Test
ServiceCollectionExtensions
.
ServiceCollection
=
services
;
ServiceCollectionExtensions
.
ServiceCollection
=
services
;
services
.
AddOptions
();
services
.
AddOptions
();
services
.
PostConfigure
<
CapOptions
>(
x
=>{});
services
.
PostConfigure
<
CapOptions
>(
x
=>{});
services
.
AddSingleton
<
IConsumerServiceSelector
,
Default
ConsumerServiceSelector
>();
services
.
AddSingleton
<
IConsumerServiceSelector
,
ConsumerServiceSelector
>();
services
.
AddScoped
<
IFooTest
,
CandidatesFooTest
>();
services
.
AddScoped
<
IFooTest
,
CandidatesFooTest
>();
services
.
AddScoped
<
IBarTest
,
CandidatesBarTest
>();
services
.
AddScoped
<
IBarTest
,
CandidatesBarTest
>();
services
.
AddLogging
();
services
.
AddLogging
();
...
...
test/DotNetCore.CAP.Test/CustomConsumerSubscribeTest.cs
View file @
66b9eb98
...
@@ -46,7 +46,7 @@ namespace DotNetCore.CAP.Test
...
@@ -46,7 +46,7 @@ namespace DotNetCore.CAP.Test
}
}
}
}
public
class
MyConsumerServiceSelector
:
Default
ConsumerServiceSelector
public
class
MyConsumerServiceSelector
:
ConsumerServiceSelector
{
{
private
readonly
CapOptions
_capOptions
;
private
readonly
CapOptions
_capOptions
;
...
...
test/DotNetCore.CAP.Test/
Consumer
InvokerTest.cs
→
test/DotNetCore.CAP.Test/
Subscribe
InvokerTest.cs
View file @
66b9eb98
...
@@ -9,15 +9,15 @@ using Xunit;
...
@@ -9,15 +9,15 @@ using Xunit;
namespace
DotNetCore.CAP.Test
namespace
DotNetCore.CAP.Test
{
{
public
class
Consumer
InvokerTest
public
class
Subscribe
InvokerTest
{
{
private
readonly
IServiceProvider
_serviceProvider
;
private
readonly
IServiceProvider
_serviceProvider
;
public
Consumer
InvokerTest
()
public
Subscribe
InvokerTest
()
{
{
var
serviceCollection
=
new
ServiceCollection
();
var
serviceCollection
=
new
ServiceCollection
();
serviceCollection
.
AddLogging
();
serviceCollection
.
AddLogging
();
serviceCollection
.
AddSingleton
<
ISubscribeInvoker
,
Default
SubscribeInvoker
>();
serviceCollection
.
AddSingleton
<
ISubscribeInvoker
,
SubscribeInvoker
>();
_serviceProvider
=
serviceCollection
.
BuildServiceProvider
();
_serviceProvider
=
serviceCollection
.
BuildServiceProvider
();
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment