SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #546 from bountin/typos

Browse Source 
Improve language and typos
This commit is contained in:
Oleg Zhurakousky
2020-06-17 08:46:20 +02:00
committed by GitHub
parent be7e44ceb6 ce0d5c9e64
commit fdbbcc4e45
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java
View File

@@ -191,7 +191,7 @@ public class BeanFactoryAwareFunctionRegistry extends SimpleFunctionRegistry imp
}
else if (!ObjectUtils.isEmpty(names)) {
if (names.size() > 1) {
logger.debug("Found more then one function beans in BeanFactory: " + names
logger.debug("Found more than one function bean in BeanFactory: " + names
+ ". If you did not intend to use functions, ignore this message. However, if you did "
+ "intend to use functions in the context of spring-cloud-function, consider "
+ "providing 'spring.cloud.function.definition' property pointing to a function bean(s) "
@@ -223,7 +223,7 @@ public class BeanFactoryAwareFunctionRegistry extends SimpleFunctionRegistry imp
definition = functionRegistrationNames[0];
}
else {
logger.debug("Found more then one function registration beans in BeanFactory: " + functionRegistrationNames
logger.debug("Found more than one function registration bean in BeanFactory: " + functionRegistrationNames
+ ". If you did not intend to use functions, ignore this message. However, if you did "
+ "intend to use functions in the context of spring-cloud-function, consider "
+ "providing 'spring.cloud.function.definition' property pointing to a function bean(s) "

4
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
View File

@@ -116,7 +116,7 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
void init(String functionDefinition) {
this.declaredFunctionDefinitions = StringUtils.hasText(functionDefinition) ? Arrays.asList(functionDefinition.split(";")) : Collections.emptyList();
if (this.declaredFunctionDefinitions.contains(RoutingFunction.FUNCTION_NAME)) {
Assert.isTrue(this.declaredFunctionDefinitions.size() == 1, "It is illegal to declare more then one function when using RoutingFunction");
Assert.isTrue(this.declaredFunctionDefinitions.size() == 1, "It is illegal to declare more than one function when using RoutingFunction");
}
}
@@ -209,7 +209,7 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
String definition = null;
if (this.registrationsByName.size() > 0) {
Assert
.isTrue(this.registrationsByName.size() == 1, "Found more then one function in local registry");
.isTrue(this.registrationsByName.size() == 1, "Found more than one function in local registry");
definition = this.registrationsByName.keySet().iterator().next();
}
return definition;

2
spring-cloud-function-context/src/main/resources/META-INF/spring-configuration-metadata.json
View File

@@ -11,7 +11,7 @@
{
"name": "spring.cloud.function.definition",
"type": "java.lang.String",
"description": "Name (e.g., 'foo') or composition instruction (e.g., 'foo|bar') used to resolve default function especially for cases where there is more then once function available in catalog.",
"description": "Name (e.g., 'foo') or composition instruction (e.g., 'foo|bar') used to resolve default function especially for cases where there is more than one function available in catalog.",
"defaultValue": ""
},
{