From 843540b7461d505eef7f904c70eedfa22a50fb7e Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Tue, 5 Jun 2018 10:11:37 +0200 Subject: [PATCH] DATAREST-1250 - Polishing. Added unit test to verify new behavior and prevent regressions. Fixed author capitalization. --- ...MetadataHandlerMethodArgumentResolver.java | 2 +- ...andlerMethodArgumentResolverUnitTests.java | 47 +++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/config/ResourceMetadataHandlerMethodArgumentResolverUnitTests.java diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/ResourceMetadataHandlerMethodArgumentResolver.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/ResourceMetadataHandlerMethodArgumentResolver.java index 2bdc02639..c5a778b8b 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/ResourceMetadataHandlerMethodArgumentResolver.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/ResourceMetadataHandlerMethodArgumentResolver.java @@ -35,7 +35,7 @@ import org.springframework.web.method.support.ModelAndViewContainer; * * @author Jon Brisbin * @author Oliver Gierke - * @author jiacheng Yang + * @author Jiacheng Yang */ public class ResourceMetadataHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver { diff --git a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/config/ResourceMetadataHandlerMethodArgumentResolverUnitTests.java b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/config/ResourceMetadataHandlerMethodArgumentResolverUnitTests.java new file mode 100644 index 000000000..dead54bee --- /dev/null +++ b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/config/ResourceMetadataHandlerMethodArgumentResolverUnitTests.java @@ -0,0 +1,47 @@ +/* + * Copyright 2018 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.data.rest.webmvc.config; + +import static org.assertj.core.api.Assertions.*; +import static org.mockito.Mockito.*; + +import org.junit.Test; +import org.springframework.core.MethodParameter; +import org.springframework.data.repository.support.Repositories; +import org.springframework.data.rest.core.mapping.ResourceMappings; +import org.springframework.data.rest.core.mapping.ResourceMetadata; +import org.springframework.data.rest.webmvc.BaseUri; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; + +/** + * Unit tests for {@link ResourceMetadataHandlerMethodArgumentResolver}. + * + * @author Oliver Gierke + */ +public class ResourceMetadataHandlerMethodArgumentResolverUnitTests { + + @Test // DATAREST-1250 + public void supportsResourceMetadataParameterType() { + + HandlerMethodArgumentResolver resolver = new ResourceMetadataHandlerMethodArgumentResolver(mock(Repositories.class), + mock(ResourceMappings.class), BaseUri.NONE); + + MethodParameter parameter = mock(MethodParameter.class); + doReturn(ResourceMetadata.class).when(parameter).getParameterType(); + + assertThat(resolver.supportsParameter(parameter)).isTrue(); + } +}