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
725a3a45
Commit
725a3a45
authored
Sep 11, 2017
by
yangxiaodong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor and remove reference of IServiceProvider
parent
975fcb7d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
12 deletions
+10
-12
IConsumerServiceSelector.cs
src/DotNetCore.CAP/Abstractions/IConsumerServiceSelector.cs
+2
-3
IConsumerHandler.Default.cs
src/DotNetCore.CAP/IConsumerHandler.Default.cs
+1
-1
IConsumerServiceSelector.Default.cs
...tNetCore.CAP/Internal/IConsumerServiceSelector.Default.cs
+3
-3
MethodMatcherCache.cs
src/DotNetCore.CAP/Internal/MethodMatcherCache.cs
+2
-3
ConsumerServiceSelectorTest.cs
test/DotNetCore.CAP.Test/ConsumerServiceSelectorTest.cs
+2
-2
No files found.
src/DotNetCore.CAP/Abstractions/IConsumerServiceSelector.cs
View file @
725a3a45
...
@@ -11,10 +11,9 @@ namespace DotNetCore.CAP.Abstractions
...
@@ -11,10 +11,9 @@ namespace DotNetCore.CAP.Abstractions
/// <summary>
/// <summary>
/// Selects a set of <see cref="ConsumerExecutorDescriptor"/> candidates for the current message associated with
/// Selects a set of <see cref="ConsumerExecutorDescriptor"/> candidates for the current message associated with
/// <paramref name="provider"/>.
/// <paramref name="provider"/>.
/// </summary>
/// </summary>
/// <param name="provider"> <see cref="IServiceProvider"/>.</param>
/// <returns>A set of <see cref="ConsumerExecutorDescriptor"/> candidates or <c>null</c>.</returns>
/// <returns>A set of <see cref="ConsumerExecutorDescriptor"/> candidates or <c>null</c>.</returns>
IReadOnlyList
<
ConsumerExecutorDescriptor
>
SelectCandidates
(
IServiceProvider
provider
);
IReadOnlyList
<
ConsumerExecutorDescriptor
>
SelectCandidates
();
/// <summary>
/// <summary>
/// Selects the best <see cref="ConsumerExecutorDescriptor"/> candidate from <paramref name="candidates"/> for the
/// Selects the best <see cref="ConsumerExecutorDescriptor"/> candidate from <paramref name="candidates"/> for the
...
...
src/DotNetCore.CAP/IConsumerHandler.Default.cs
View file @
725a3a45
...
@@ -47,7 +47,7 @@ namespace DotNetCore.CAP
...
@@ -47,7 +47,7 @@ namespace DotNetCore.CAP
public
void
Start
()
public
void
Start
()
{
{
var
groupingMatchs
=
_selector
.
GetCandidatesMethodsOfGroupNameGrouped
(
_serviceProvider
);
var
groupingMatchs
=
_selector
.
GetCandidatesMethodsOfGroupNameGrouped
();
foreach
(
var
matchGroup
in
groupingMatchs
)
foreach
(
var
matchGroup
in
groupingMatchs
)
{
{
...
...
src/DotNetCore.CAP/Internal/IConsumerServiceSelector.Default.cs
View file @
725a3a45
...
@@ -33,13 +33,13 @@ namespace DotNetCore.CAP.Internal
...
@@ -33,13 +33,13 @@ namespace DotNetCore.CAP.Internal
return
executeDescriptor
.
FirstOrDefault
(
x
=>
x
.
Attribute
.
Name
==
key
);
return
executeDescriptor
.
FirstOrDefault
(
x
=>
x
.
Attribute
.
Name
==
key
);
}
}
public
IReadOnlyList
<
ConsumerExecutorDescriptor
>
SelectCandidates
(
IServiceProvider
provider
)
public
IReadOnlyList
<
ConsumerExecutorDescriptor
>
SelectCandidates
()
{
{
var
executorDescriptorList
=
new
List
<
ConsumerExecutorDescriptor
>();
var
executorDescriptorList
=
new
List
<
ConsumerExecutorDescriptor
>();
executorDescriptorList
.
AddRange
(
FindConsumersFromInterfaceTypes
(
p
rovider
));
executorDescriptorList
.
AddRange
(
FindConsumersFromInterfaceTypes
(
_serviceP
rovider
));
executorDescriptorList
.
AddRange
(
FindConsumersFromControllerTypes
(
p
rovider
));
executorDescriptorList
.
AddRange
(
FindConsumersFromControllerTypes
(
_serviceP
rovider
));
return
executorDescriptorList
;
return
executorDescriptorList
;
}
}
...
...
src/DotNetCore.CAP/Internal/MethodMatcherCache.cs
View file @
725a3a45
...
@@ -22,12 +22,11 @@ namespace DotNetCore.CAP.Internal
...
@@ -22,12 +22,11 @@ namespace DotNetCore.CAP.Internal
/// Get a dictionary of candidates.In the dictionary,
/// Get a dictionary of candidates.In the dictionary,
/// the Key is the CAPSubscribeAttribute Group, the Value for the current Group of candidates
/// the Key is the CAPSubscribeAttribute Group, the Value for the current Group of candidates
/// </summary>
/// </summary>
/// <param name="provider"><see cref="IServiceProvider"/></param>
public
ConcurrentDictionary
<
string
,
IList
<
ConsumerExecutorDescriptor
>>
GetCandidatesMethodsOfGroupNameGrouped
()
public
ConcurrentDictionary
<
string
,
IList
<
ConsumerExecutorDescriptor
>>
GetCandidatesMethodsOfGroupNameGrouped
(
IServiceProvider
provider
)
{
{
if
(
Entries
.
Count
!=
0
)
return
Entries
;
if
(
Entries
.
Count
!=
0
)
return
Entries
;
var
executorCollection
=
_selector
.
SelectCandidates
(
provider
);
var
executorCollection
=
_selector
.
SelectCandidates
();
var
groupedCandidates
=
executorCollection
.
GroupBy
(
x
=>
x
.
Attribute
.
Group
);
var
groupedCandidates
=
executorCollection
.
GroupBy
(
x
=>
x
.
Attribute
.
Group
);
...
...
test/DotNetCore.CAP.Test/ConsumerServiceSelectorTest.cs
View file @
725a3a45
...
@@ -25,7 +25,7 @@ namespace DotNetCore.CAP.Test
...
@@ -25,7 +25,7 @@ namespace DotNetCore.CAP.Test
public
void
CanFindAllConsumerService
()
public
void
CanFindAllConsumerService
()
{
{
var
selector
=
_provider
.
GetRequiredService
<
IConsumerServiceSelector
>();
var
selector
=
_provider
.
GetRequiredService
<
IConsumerServiceSelector
>();
var
candidates
=
selector
.
SelectCandidates
(
_provider
);
var
candidates
=
selector
.
SelectCandidates
();
Assert
.
Equal
(
2
,
candidates
.
Count
);
Assert
.
Equal
(
2
,
candidates
.
Count
);
}
}
...
@@ -34,7 +34,7 @@ namespace DotNetCore.CAP.Test
...
@@ -34,7 +34,7 @@ namespace DotNetCore.CAP.Test
public
void
CanFindSpecifiedTopic
()
public
void
CanFindSpecifiedTopic
()
{
{
var
selector
=
_provider
.
GetRequiredService
<
IConsumerServiceSelector
>();
var
selector
=
_provider
.
GetRequiredService
<
IConsumerServiceSelector
>();
var
candidates
=
selector
.
SelectCandidates
(
_provider
);
var
candidates
=
selector
.
SelectCandidates
();
var
bestCandidates
=
selector
.
SelectBestCandidate
(
"Candidates.Foo"
,
candidates
);
var
bestCandidates
=
selector
.
SelectBestCandidate
(
"Candidates.Foo"
,
candidates
);
Assert
.
NotNull
(
bestCandidates
);
Assert
.
NotNull
(
bestCandidates
);
...
...
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