From 4311aa949c291cda21216e860bffa8a734817800 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Mon, 17 Sep 2018 11:22:17 +0100 Subject: [PATCH] Revert "Use comma instead of pipe (better in URL path)" This reverts commit f0e2f0b975cbbf39f4d694175a696467e3eadc02. --- .../cloud/function/deployer/FunctionCreatorConfiguration.java | 3 ++- .../cloud/function/deployer/FunctionProperties.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionCreatorConfiguration.java b/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionCreatorConfiguration.java index 3b5b867b0..f31298d8a 100644 --- a/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionCreatorConfiguration.java +++ b/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionCreatorConfiguration.java @@ -379,7 +379,8 @@ class FunctionCreatorConfiguration { return; } FunctionRegistration registration = new FunctionRegistration( - bean, FunctionProperties.functionName(counter.getAndIncrement())); + bean).names( + FunctionProperties.functionName(counter.getAndIncrement())); if (this.runner != null) { if (this.runner.containsBean(FunctionInspector.class.getName())) { Object inspector = this.runner diff --git a/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionProperties.java b/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionProperties.java index 33b503b13..f67f9b080 100644 --- a/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionProperties.java +++ b/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionProperties.java @@ -82,7 +82,7 @@ public class FunctionProperties { for (int i = 0; i <= StringUtils.countOccurrencesOf(name, ","); i++) { names.add("function" + i); } - return StringUtils.collectionToDelimitedString(names, ","); + return StringUtils.collectionToDelimitedString(names, "|"); } public static String functionName(int value) {