SONAR-17645 Enable SCIM feature toggling mechanism

1 files changed, 13 insertions, 1 deletions

diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/saml/ws/ValidationAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/saml/ws/ValidationAction.java
index 3b1c5e37a86..2aa1777fc40 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/saml/ws/ValidationAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/saml/ws/ValidationAction.java
@@ -21,6 +21,8 @@
 package org.sonar.server.saml.ws;
 
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.stream.Collectors;
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
@@ -40,9 +42,12 @@ import org.sonar.server.authentication.event.AuthenticationException;
 import org.sonar.server.user.ThreadLocalUserSession;
 import org.sonar.server.ws.ServletFilterHandler;
 
+import static org.sonar.server.saml.ws.SamlValidationWs.SAML_VALIDATION_CONTROLLER;
+
 public class ValidationAction extends ServletFilter implements SamlAction {
 
   static final String VALIDATION_CALLBACK_KEY = SamlValidationRedirectionFilter.SAML_VALIDATION_KEY;
+  private static final String URL_DELIMITER = "/";
   private final ThreadLocalUserSession userSession;
   private final SamlAuthenticator samlAuthenticator;
   private final OAuth2ContextFactory oAuth2ContextFactory;
@@ -60,7 +65,7 @@ public class ValidationAction extends ServletFilter implements SamlAction {
 
   @Override
   public UrlPattern doGetPattern() {
-    return UrlPattern.create("/" + SamlValidationWs.SAML_VALIDATION_CONTROLLER + "/" + VALIDATION_CALLBACK_KEY);
+    return UrlPattern.create(composeUrlPattern(SAML_VALIDATION_CONTROLLER, VALIDATION_CALLBACK_KEY));
   }
 
   @Override
@@ -105,4 +110,11 @@ public class ValidationAction extends ServletFilter implements SamlAction {
       .setDescription("SAML assertion value")
       .setRequired(true);
   }
+
+  private static String composeUrlPattern(String... parameters) {
+    return Arrays
+      .stream(parameters)
+      .map(URL_DELIMITER::concat)
+      .collect(Collectors.joining());
+  }
 }