Skip to content

Commit 7f31cf7

Browse files
committed
Replace com.mysema.c.l.Pair usage with Spring Data's Pair.
Newer versions of the OpenFeign Querydsl fork have removed the mysema.lang dependency so we're refining our API usage to avoid breaking changes because of non-significant API usage that can be done slightly differently. Closes #2511
1 parent 1c27b81 commit 7f31cf7

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/QuerydslAwareRootResourceInformationHandlerMethodArgumentResolver.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,20 @@
3131
import org.springframework.data.repository.support.RepositoryInvoker;
3232
import org.springframework.data.repository.support.RepositoryInvokerFactory;
3333
import org.springframework.data.rest.webmvc.RootResourceInformation;
34+
import org.springframework.data.util.Pair;
3435
import org.springframework.data.util.TypeInformation;
3536
import org.springframework.util.LinkedMultiValueMap;
3637
import org.springframework.util.MultiValueMap;
3738
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
3839

39-
import com.mysema.commons.lang.Pair;
4040
import com.querydsl.core.types.Predicate;
4141

4242
/**
4343
* {@link HandlerMethodArgumentResolver} to create {@link RootResourceInformation} for injection into Spring MVC
4444
* controller methods.
4545
*
4646
* @author Oliver Gierke
47+
* @author Mark Paluch
4748
* @since 2.4
4849
*/
4950
class QuerydslAwareRootResourceInformationHandlerMethodArgumentResolver

0 commit comments

Comments
 (0)