You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2019/12/22 17:10:34 UTC
[syncope] branch master updated: Upgrading Spring Cloud Gateway
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 45ad9ec Upgrading Spring Cloud Gateway
45ad9ec is described below
commit 45ad9ecc793f19a7c3f5fcf6fe956e728966b68e
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Sun Dec 22 17:32:38 2019 +0100
Upgrading Spring Cloud Gateway
---
pom.xml | 2 +-
sra/src/main/java/org/apache/syncope/sra/RouteProvider.java | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index e8e1b1c..5e15d40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -411,7 +411,7 @@ under the License.
<spring.version>5.2.2.RELEASE</spring.version>
<spring-security.version>5.2.1.RELEASE</spring-security.version>
<spring-boot.version>2.2.2.RELEASE</spring-boot.version>
- <spring-cloud-gateway.version>2.2.0.RELEASE</spring-cloud-gateway.version>
+ <spring-cloud-gateway.version>2.2.1.RELEASE</spring-cloud-gateway.version>
<openjpa.version>3.1.0</openjpa.version>
<hikaricp.version>3.4.1</hikaricp.version>
diff --git a/sra/src/main/java/org/apache/syncope/sra/RouteProvider.java b/sra/src/main/java/org/apache/syncope/sra/RouteProvider.java
index 3008ba6..fb6c37c 100644
--- a/sra/src/main/java/org/apache/syncope/sra/RouteProvider.java
+++ b/sra/src/main/java/org/apache/syncope/sra/RouteProvider.java
@@ -22,6 +22,7 @@ import java.time.ZonedDateTime;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.lib.AnonymousAuthenticationHandler;
@@ -349,8 +350,10 @@ public class RouteProvider {
break;
case METHOD:
+ String[] methodArgs = gwpredicate.getArgs().split(",");
predicate = ctx.getBean(MethodRoutePredicateFactory.class).
- applyAsync(c -> c.setMethod(HttpMethod.resolve(gwpredicate.getArgs().trim())));
+ applyAsync(c -> c.setMethods(
+ Stream.of(methodArgs).map(arg -> HttpMethod.resolve(arg.trim())).toArray(HttpMethod[]::new)));
break;
case PATH: