Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve Values from Mapping Path for Mvc Uri Builder #26914

Closed
wants to merge 1 commit into from
Closed

Resolve Values from Mapping Path for Mvc Uri Builder #26914

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 29 additions & 11 deletions ...n/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,14 @@
import org.springframework.cglib.proxy.Enhancer;
import org.springframework.cglib.proxy.Factory;
import org.springframework.cglib.proxy.MethodProxy;
import org.springframework.context.EmbeddedValueResolverAware;
import org.springframework.core.DefaultParameterNameDiscoverer;
import org.springframework.core.MethodIntrospector;
import org.springframework.core.MethodParameter;
import org.springframework.core.ParameterNameDiscoverer;
import org.springframework.core.annotation.AnnotatedElementUtils;
import org.springframework.core.annotation.SynthesizingMethodParameter;
import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable;
import org.springframework.objenesis.ObjenesisException;
import org.springframework.objenesis.SpringObjenesis;
Expand All @@ -53,6 +55,7 @@
import org.springframework.util.ReflectionUtils;
import org.springframework.util.ReflectionUtils.MethodFilter;
import org.springframework.util.StringUtils;
import org.springframework.util.StringValueResolver;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.request.RequestAttributes;
Expand Down Expand Up @@ -95,7 +98,7 @@
* @author Sam Brannen
* @since 4.0
*/
public class MvcUriComponentsBuilder {
public class MvcUriComponentsBuilder implements EmbeddedValueResolverAware {

/**
* Well-known name for the {@link CompositeUriComponentsContributor} object in the bean factory.
Expand All @@ -118,6 +121,10 @@ public class MvcUriComponentsBuilder {
new PathVariableMethodArgumentResolver(), new RequestParamMethodArgumentResolver(false));
}


@Nullable
private static StringValueResolver valueResolver;

private final UriComponentsBuilder baseUrl;


Expand Down Expand Up @@ -581,14 +588,7 @@ private static String getClassMapping(Class<?> controllerType) {
if (mapping == null) {
return "/";
}
String[] paths = mapping.path();
if (ObjectUtils.isEmpty(paths) || !StringUtils.hasLength(paths[0])) {
return "/";
}
if (paths.length > 1 && logger.isTraceEnabled()) {
logger.trace("Using first of multiple paths on " + controllerType.getName());
}
return paths[0];
return getValueFromRequestMapping(mapping, controllerType.getName());
}

private static String getMethodMapping(Method method) {
Expand All @@ -597,14 +597,28 @@ private static String getMethodMapping(Method method) {
if (requestMapping == null) {
throw new IllegalArgumentException("No @RequestMapping on: " + method.toGenericString());
}
return getValueFromRequestMapping(requestMapping, method.toGenericString());
}

private static String getValueFromRequestMapping(@NonNull RequestMapping requestMapping, String resourceName) {
String[] paths = requestMapping.path();
if (ObjectUtils.isEmpty(paths) || !StringUtils.hasLength(paths[0])) {
return "/";
}
if (paths.length > 1 && logger.isTraceEnabled()) {
logger.trace("Using first of multiple paths on " + method.toGenericString());
logger.trace("Using first of multiple paths on " + resourceName);
}
return paths[0];
String path = paths[0];
if (valueResolver != null) {
String resolvedValue = valueResolver.resolveStringValue(path);
if (resolvedValue != null) {
path = resolvedValue;
}
else if (logger.isTraceEnabled()) {
logger.trace("Unable to resolve value for path : " + path + " for : " + resourceName);
}
}
return path;
}

private static Method getMethod(Class<?> controllerType, final String methodName, final Object... args) {
Expand Down Expand Up @@ -677,6 +691,10 @@ private static WebApplicationContext getWebApplicationContext() {
return wac;
}

@Override
public void setEmbeddedValueResolver(StringValueResolver resolver) {
valueResolver = resolver;
}


/**
Expand Down