Move some tests to AbstractEndpointHandlerMapping
See gh-7108
This commit is contained in:
parent
5fc58b45ff
commit
9bde1e89cb
|
@ -52,7 +52,7 @@ import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandl
|
||||||
* @author Dave Syer
|
* @author Dave Syer
|
||||||
* @author Madhura Bhave
|
* @author Madhura Bhave
|
||||||
*/
|
*/
|
||||||
public class AbstractEndpointHandlerMapping<E extends MvcEndpoint>
|
public abstract class AbstractEndpointHandlerMapping<E extends MvcEndpoint>
|
||||||
extends RequestMappingHandlerMapping {
|
extends RequestMappingHandlerMapping {
|
||||||
|
|
||||||
private final Set<E> endpoints;
|
private final Set<E> endpoints;
|
||||||
|
|
|
@ -22,6 +22,7 @@ import java.util.Collections;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import org.springframework.boot.actuate.endpoint.AbstractEndpoint;
|
import org.springframework.boot.actuate.endpoint.AbstractEndpoint;
|
||||||
|
import org.springframework.boot.actuate.endpoint.mvc.AbstractEndpointHandlerMappingTests;
|
||||||
import org.springframework.boot.actuate.endpoint.mvc.EndpointMvcAdapter;
|
import org.springframework.boot.actuate.endpoint.mvc.EndpointMvcAdapter;
|
||||||
import org.springframework.boot.actuate.endpoint.mvc.HalJsonMvcEndpoint;
|
import org.springframework.boot.actuate.endpoint.mvc.HalJsonMvcEndpoint;
|
||||||
import org.springframework.boot.actuate.endpoint.mvc.ManagementServletContext;
|
import org.springframework.boot.actuate.endpoint.mvc.ManagementServletContext;
|
||||||
|
@ -39,7 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||||
*
|
*
|
||||||
* @author Madhura Bhave
|
* @author Madhura Bhave
|
||||||
*/
|
*/
|
||||||
public class CloudFoundryEndpointHandlerMappingTests {
|
public class CloudFoundryEndpointHandlerMappingTests extends AbstractEndpointHandlerMappingTests {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void getHandlerExecutionChainShouldHaveSecurityInterceptor() throws Exception {
|
public void getHandlerExecutionChainShouldHaveSecurityInterceptor() throws Exception {
|
||||||
|
@ -117,7 +118,6 @@ public class CloudFoundryEndpointHandlerMappingTests {
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,108 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2012-2015 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.boot.actuate.endpoint.mvc;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Collection;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import org.springframework.boot.actuate.endpoint.AbstractEndpoint;
|
||||||
|
import org.springframework.context.support.StaticApplicationContext;
|
||||||
|
import org.springframework.mock.web.MockHttpServletRequest;
|
||||||
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
|
|
||||||
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tests for {@link AbstractEndpointHandlerMapping}.
|
||||||
|
*
|
||||||
|
* @author Madhura Bhave
|
||||||
|
*/
|
||||||
|
public abstract class AbstractEndpointHandlerMappingTests {
|
||||||
|
|
||||||
|
private final StaticApplicationContext context = new StaticApplicationContext();
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void pathNotMappedWhenGetPathReturnsNull() throws Exception {
|
||||||
|
TestMvcEndpoint endpoint = new TestMvcEndpoint(new TestEndpoint("a"));
|
||||||
|
TestActionEndpoint other = new TestActionEndpoint(new TestEndpoint("b"));
|
||||||
|
AbstractEndpointHandlerMapping mapping = new TestEndpointHandlerMapping(
|
||||||
|
Arrays.asList(endpoint, other));
|
||||||
|
mapping.setApplicationContext(this.context);
|
||||||
|
mapping.afterPropertiesSet();
|
||||||
|
assertThat(mapping.getHandlerMethods()).hasSize(1);
|
||||||
|
assertThat(mapping.getHandler(request("GET", "/a"))).isNull();
|
||||||
|
assertThat(mapping.getHandler(request("POST", "/b"))).isNotNull();
|
||||||
|
}
|
||||||
|
|
||||||
|
private MockHttpServletRequest request(String method, String requestURI) {
|
||||||
|
return new MockHttpServletRequest(method, requestURI);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class TestEndpoint extends AbstractEndpoint<Object> {
|
||||||
|
|
||||||
|
TestEndpoint(String id) {
|
||||||
|
super(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Object invoke() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class TestMvcEndpoint extends EndpointMvcAdapter {
|
||||||
|
|
||||||
|
TestMvcEndpoint(TestEndpoint delegate) {
|
||||||
|
super(delegate);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class TestActionEndpoint extends EndpointMvcAdapter {
|
||||||
|
|
||||||
|
TestActionEndpoint(TestEndpoint delegate) {
|
||||||
|
super(delegate);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@PostMapping
|
||||||
|
public Object invoke() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class TestEndpointHandlerMapping extends AbstractEndpointHandlerMapping {
|
||||||
|
|
||||||
|
TestEndpointHandlerMapping(Collection<? extends MvcEndpoint> endpoints) {
|
||||||
|
super(endpoints);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected String getPath(MvcEndpoint endpoint) {
|
||||||
|
if (endpoint instanceof TestActionEndpoint) {
|
||||||
|
return super.getPath(endpoint);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -18,7 +18,6 @@ package org.springframework.boot.actuate.endpoint.mvc;
|
||||||
|
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Collection;
|
|
||||||
|
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
@ -39,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||||
* @author Phillip Webb
|
* @author Phillip Webb
|
||||||
* @author Dave Syer
|
* @author Dave Syer
|
||||||
*/
|
*/
|
||||||
public class EndpointHandlerMappingTests {
|
public class EndpointHandlerMappingTests extends AbstractEndpointHandlerMappingTests {
|
||||||
|
|
||||||
private final StaticApplicationContext context = new StaticApplicationContext();
|
private final StaticApplicationContext context = new StaticApplicationContext();
|
||||||
|
|
||||||
|
@ -137,19 +136,6 @@ public class EndpointHandlerMappingTests {
|
||||||
assertThat(mapping.getHandler(request("POST", "/a"))).isNull();
|
assertThat(mapping.getHandler(request("POST", "/a"))).isNull();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
public void pathNotMappedWhenGetPathReturnsNull() throws Exception {
|
|
||||||
TestMvcEndpoint endpoint = new TestMvcEndpoint(new TestEndpoint("a"));
|
|
||||||
TestActionEndpoint other = new TestActionEndpoint(new TestEndpoint("b"));
|
|
||||||
EndpointHandlerMapping mapping = new TestEndpointHandlerMapping(
|
|
||||||
Arrays.asList(endpoint, other));
|
|
||||||
mapping.setApplicationContext(this.context);
|
|
||||||
mapping.afterPropertiesSet();
|
|
||||||
assertThat(mapping.getHandlerMethods()).hasSize(1);
|
|
||||||
assertThat(mapping.getHandler(request("GET", "/a"))).isNull();
|
|
||||||
assertThat(mapping.getHandler(request("POST", "/b"))).isNotNull();
|
|
||||||
}
|
|
||||||
|
|
||||||
private MockHttpServletRequest request(String method, String requestURI) {
|
private MockHttpServletRequest request(String method, String requestURI) {
|
||||||
return new MockHttpServletRequest(method, requestURI);
|
return new MockHttpServletRequest(method, requestURI);
|
||||||
}
|
}
|
||||||
|
@ -189,20 +175,4 @@ public class EndpointHandlerMappingTests {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static class TestEndpointHandlerMapping extends EndpointHandlerMapping {
|
|
||||||
|
|
||||||
TestEndpointHandlerMapping(Collection<? extends MvcEndpoint> endpoints) {
|
|
||||||
super(endpoints);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected String getPath(MvcEndpoint endpoint) {
|
|
||||||
if (endpoint instanceof TestActionEndpoint) {
|
|
||||||
return super.getPath(endpoint);
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue