refactor so that we can reuse the ZoneResolutionMode in other MockMvc tests

Author: fhanik

uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/ZonePathTokenMockMvcTests.java

@@ -5,45 +5,26 @@
 import org.cloudfoundry.identity.uaa.oauth.common.util.OAuth2Utils;
 import org.cloudfoundry.identity.uaa.oauth.jwt.Jwt;
 import org.cloudfoundry.identity.uaa.oauth.jwt.JwtHelper;
+import org.cloudfoundry.identity.uaa.mock.util.MockMvcUtils.ZoneResolutionMode;
 import org.cloudfoundry.identity.uaa.util.JsonUtils;
-import org.cloudfoundry.identity.uaa.util.SetServerNameRequestPostProcessor;
 import org.cloudfoundry.identity.uaa.zone.IdentityZone;
 import org.cloudfoundry.identity.uaa.zone.IdentityZoneHolder;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
-import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+import org.springframework.http.HttpMethod;
 
 import java.util.Map;
-import java.util.function.Function;
 
 import static org.cloudfoundry.identity.uaa.authentication.AbstractClientParametersAuthenticationFilter.CLIENT_SECRET;
 import static org.cloudfoundry.identity.uaa.oauth.token.ClaimConstants.ISS;
 import static org.cloudfoundry.identity.uaa.oauth.token.TokenConstants.GRANT_TYPE_CLIENT_CREDENTIALS;
 import static org.springframework.http.MediaType.APPLICATION_FORM_URLENCODED;
 import static org.springframework.http.MediaType.APPLICATION_JSON;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 public class ZonePathTokenMockMvcTests extends AbstractTokenMockMvcTests {
 
-    private enum ZoneResolutionMode {
-        SUBDOMAIN(subdomain -> get("/oauth/token")
-                .with(new SetServerNameRequestPostProcessor(subdomain + ".localhost"))
-        ),
-        ZONE_PATH(subdomain -> get("/z/{subdomain}/oauth/token", subdomain));
-
-        private final Function<String, MockHttpServletRequestBuilder> requestBuilder;
-
-        ZoneResolutionMode(Function<String, MockHttpServletRequestBuilder> requestBuilder) {
-            this.requestBuilder = requestBuilder;
-        }
-
-        MockHttpServletRequestBuilder createRequestBuilder(String subdomain) {
-            return requestBuilder.apply(subdomain);
-        }
-    }
-
     @ParameterizedTest
     @EnumSource(ZoneResolutionMode.class)
     void clientCredentialsGrant(ZoneResolutionMode mode) throws Exception {
@@ -59,7 +40,7 @@ void clientCredentialsGrant(ZoneResolutionMode mode) throws Exception {
 
         IdentityZoneHolder.clear();
 
-        String tokenResult = mockMvc.perform(mode.createRequestBuilder(subdomain)
+        String tokenResult = mockMvc.perform(mode.createRequestBuilder(subdomain, HttpMethod.GET, "/oauth/token")
                         .accept(APPLICATION_JSON)
                         .contentType(APPLICATION_FORM_URLENCODED)
                         .param(OAuth2Utils.GRANT_TYPE, GRANT_TYPE_CLIENT_CREDENTIALS)

uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/util/MockMvcUtils.java

@@ -69,6 +69,7 @@
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.event.ApplicationEventMulticaster;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.mock.web.MockHttpServletRequest;
@@ -134,6 +135,53 @@ private MockMvcUtils() {
         throw new java.lang.UnsupportedOperationException("This is a utility class and cannot be instantiated");
     }
 
+    /**
+     * Mode for resolving identity zone in tests: by host subdomain or by path prefix {@code /z/{subdomain}/}.
+     * The test passes the path suffix (e.g. {@code "/oauth/token"});
+     * the mode constructs the full path.
+     */
+    public enum ZoneResolutionMode {
+        SUBDOMAIN {
+            @Override
+            public MockHttpServletRequestBuilder createRequestBuilder(String subdomain, HttpMethod method, String pathSuffix) {
+                return requestBuilderForMethod(method, pathSuffix)
+                        .with(new SetServerNameRequestPostProcessor(subdomain + ".localhost"));
+            }
+        },
+        ZONE_PATH {
+            @Override
+            public MockHttpServletRequestBuilder createRequestBuilder(String subdomain, HttpMethod method, String pathSuffix) {
+                return requestBuilderForMethod(method, "/z/{subdomain}" + pathSuffix, subdomain);
+            }
+        };
+
+        public abstract MockHttpServletRequestBuilder createRequestBuilder(String subdomain, HttpMethod method, String pathSuffix);
+    }
+
+    /**
+     * Builds a MockHttpServletRequestBuilder for the given HTTP method and path.
+     *
+     * @param method   the HTTP method (GET, POST, PUT, DELETE)
+     * @param path     the path (may contain path variables like {@code /z/{subdomain}/oauth/token})
+     * @param pathVars optional path variable values
+     * @return the request builder
+     */
+    public static MockHttpServletRequestBuilder requestBuilderForMethod(HttpMethod method, String path, Object... pathVars) {
+        if (method == HttpMethod.GET) {
+            return get(path, pathVars);
+        }
+        if (method == HttpMethod.POST) {
+            return post(path, pathVars);
+        }
+        if (method == HttpMethod.PUT) {
+            return put(path, pathVars);
+        }
+        if (method == HttpMethod.DELETE) {
+            return delete(path, pathVars);
+        }
+        throw new IllegalArgumentException("Unsupported method: " + method);
+    }
+
     private static final String SIMPLESAMLPHP_UAA_ACCEPTANCE = "http://simplesamlphp.uaa-acceptance.cf-app.com";
 
     public static final String IDP_META_DATA =