Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
ming zheng
Spring Cloud Function
Commits
2fa75594
Commit
2fa75594
authored
5 years ago
by
Oleg Zhurakousky
Browse files
Options
Download
Email Patches
Plain Diff
Fix the implicit composition logic in BeanFactoryAwareFunctionRegistry
parent
ab68cb58
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java
+5
-5
...ion/context/catalog/BeanFactoryAwareFunctionRegistry.java
with
5 additions
and
5 deletions
+5
-5
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java
+
5
-
5
View file @
2fa75594
...
...
@@ -173,7 +173,11 @@ public class BeanFactoryAwareFunctionRegistry extends SimpleFunctionRegistry imp
.
concat
(
Stream
.
of
(
functionNames
),
Stream
.
concat
(
Stream
.
of
(
consumerNames
),
Stream
.
of
(
supplierNames
)))
.
collect
(
Collectors
.
toList
());
if
(!
ObjectUtils
.
isEmpty
(
names
))
{
if
(
definition
.
endsWith
(
"|"
))
{
Set
<
String
>
fNames
=
this
.
getNames
(
null
);
definition
=
this
.
determinImpliedDefinition
(
fNames
,
definition
);
}
else
if
(!
ObjectUtils
.
isEmpty
(
names
))
{
if
(
names
.
size
()
>
1
)
{
logger
.
info
(
"Found more then one function beans in BeanFactory: "
+
names
+
". If you did not intend to use functions, ignore this message. However, if you did "
...
...
@@ -184,10 +188,6 @@ public class BeanFactoryAwareFunctionRegistry extends SimpleFunctionRegistry imp
}
definition
=
names
.
get
(
0
);
}
else
if
(
definition
.
endsWith
(
"|"
))
{
Set
<
String
>
fNames
=
this
.
getNames
(
null
);
definition
=
this
.
determinImpliedDefinition
(
fNames
,
definition
);
}
else
{
definition
=
this
.
discoverDefaultDefinitionFromRegistration
();
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
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
Menu
Projects
Groups
Snippets
Help