diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletMapping.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletMapping.java new file mode 100644 index 0000000000..0f23792b4d --- /dev/null +++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletMapping.java @@ -0,0 +1,80 @@ +/* + * Copyright 2002-2021 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 + * + * https://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.mock.web; + +import javax.servlet.http.HttpServletMapping; +import javax.servlet.http.MappingMatch; + +import org.springframework.lang.Nullable; + +/** + * Mock implementation of {@link HttpServletMapping}. + * + * @author Rossen Stoyanchev + * @since 5.3.4 + */ +public class MockHttpServletMapping implements HttpServletMapping { + + private final String matchValue; + + private final String pattern; + + private final String servletName; + + @Nullable + private final MappingMatch mappingMatch; + + + public MockHttpServletMapping( + String matchValue, String pattern, String servletName, @Nullable MappingMatch match) { + + this.matchValue = matchValue; + this.pattern = pattern; + this.servletName = servletName; + this.mappingMatch = match; + } + + + @Override + public String getMatchValue() { + return this.matchValue; + } + + @Override + public String getPattern() { + return this.pattern; + } + + @Override + public String getServletName() { + return this.servletName; + } + + @Override + @Nullable + public MappingMatch getMappingMatch() { + return this.mappingMatch; + } + + + @Override + public String toString() { + return "MockHttpServletMapping [matchValue=\"" + matchValue + "\", " + + "pattern=\"" + pattern + "\", servletName=\"" + servletName + "\", " + + "mappingMatch=" + mappingMatch + "]"; + } + +} diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java index 1fb0697606..b7126ee294 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2021 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. @@ -52,6 +52,7 @@ import javax.servlet.ServletInputStream; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletMapping; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; @@ -274,6 +275,8 @@ public class MockHttpServletRequest implements HttpServletRequest { private final MultiValueMap parts = new LinkedMultiValueMap<>(); + private HttpServletMapping httpServletMapping = new MockHttpServletMapping("", "", "", null); + // --------------------------------------------------------------------- // Constructors @@ -1390,6 +1393,15 @@ public class MockHttpServletRequest implements HttpServletRequest { return result; } + public void setHttpServletMapping(HttpServletMapping httpServletMapping) { + this.httpServletMapping = httpServletMapping; + } + + @Override + public HttpServletMapping getHttpServletMapping() { + return this.httpServletMapping; + } + @Override public T upgrade(Class handlerClass) throws IOException, ServletException { throw new UnsupportedOperationException(); diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletMapping.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletMapping.java new file mode 100644 index 0000000000..50d23d5e3c --- /dev/null +++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletMapping.java @@ -0,0 +1,80 @@ +/* + * Copyright 2002-2021 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 + * + * https://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.web.testfixture.servlet; + +import javax.servlet.http.HttpServletMapping; +import javax.servlet.http.MappingMatch; + +import org.springframework.lang.Nullable; + +/** + * Mock implementation of {@link HttpServletMapping}. + * + * @author Rossen Stoyanchev + * @since 5.3.4 + */ +public class MockHttpServletMapping implements HttpServletMapping { + + private final String matchValue; + + private final String pattern; + + private final String servletName; + + @Nullable + private final MappingMatch mappingMatch; + + + public MockHttpServletMapping( + String matchValue, String pattern, String servletName, @Nullable MappingMatch match) { + + this.matchValue = matchValue; + this.pattern = pattern; + this.servletName = servletName; + this.mappingMatch = match; + } + + + @Override + public String getMatchValue() { + return this.matchValue; + } + + @Override + public String getPattern() { + return this.pattern; + } + + @Override + public String getServletName() { + return this.servletName; + } + + @Override + @Nullable + public MappingMatch getMappingMatch() { + return this.mappingMatch; + } + + + @Override + public String toString() { + return "MockHttpServletMapping [matchValue=\"" + matchValue + "\", " + + "pattern=\"" + pattern + "\", servletName=\"" + servletName + "\", " + + "mappingMatch=" + mappingMatch + "]"; + } + +} \ No newline at end of file diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java index dac838661f..d9023c3ca1 100644 --- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java +++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2021 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. @@ -52,6 +52,7 @@ import javax.servlet.ServletInputStream; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletMapping; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; @@ -274,6 +275,8 @@ public class MockHttpServletRequest implements HttpServletRequest { private final MultiValueMap parts = new LinkedMultiValueMap<>(); + private HttpServletMapping httpServletMapping = new MockHttpServletMapping("", "", "", null); + // --------------------------------------------------------------------- // Constructors @@ -1390,6 +1393,15 @@ public class MockHttpServletRequest implements HttpServletRequest { return result; } + public void setHttpServletMapping(HttpServletMapping httpServletMapping) { + this.httpServletMapping = httpServletMapping; + } + + @Override + public HttpServletMapping getHttpServletMapping() { + return this.httpServletMapping; + } + @Override public T upgrade(Class handlerClass) throws IOException, ServletException { throw new UnsupportedOperationException();