Spring/spring-data-rest
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move off deprecated API of Spring HATEOAS' AnnotationMappingDiscoverer.

Browse Source 
Fixes GH-2490.
This commit is contained in:
Oliver Drotbohm
2025-06-04 20:11:38 +02:00
parent 47e103b2e8
commit 09ded2d221
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/util/UriUtils.java
View File

@@ -19,6 +19,7 @@ import java.lang.reflect.Method;
import java.util.List; import java.util.List;
import org.springframework.hateoas.server.core.AnnotationMappingDiscoverer; import org.springframework.hateoas.server.core.AnnotationMappingDiscoverer;
import org.springframework.hateoas.server.core.UriMapping;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.util.UriComponentsBuilder; import org.springframework.web.util.UriComponentsBuilder;
@@ -48,9 +49,9 @@ public abstract class UriUtils {
Assert.hasText(variable, "Variable name must not be null or empty"); Assert.hasText(variable, "Variable name must not be null or empty");
Assert.notNull(method, "Method must not be null"); Assert.notNull(method, "Method must not be null");
String mapping = DISCOVERER.getMapping(method); UriMapping mapping = DISCOVERER.getUriMapping(method);
return new org.springframework.web.util.UriTemplate(mapping) // return new org.springframework.web.util.UriTemplate(mapping.getMapping()) //
.match(lookupPath) // .match(lookupPath) //
.get(variable); .get(variable);
} }
@@ -65,8 +66,8 @@ public abstract class UriUtils {
Assert.notNull(method, "Method must not be null"); Assert.notNull(method, "Method must not be null");
String mapping = DISCOVERER.getMapping(method.getDeclaringClass(), method); UriMapping mapping = DISCOVERER.getUriMapping(method.getDeclaringClass(), method);
return UriComponentsBuilder.fromPath(mapping).build().getPathSegments(); return UriComponentsBuilder.fromPath(mapping.getMapping()).build().getPathSegments();
} }
} }