mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Delegate usesPathPatterns()
call to mappings
Update `CompositeHandlerMapping` so that the `usesPathPatterns()` method returns `true` if any of the delegate mappings return `true`. Closes gh-24877
This commit is contained in:
parent
3e376b955d
commit
69fbd2f8aa
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2019 the original author or authors.
|
* Copyright 2012-2021 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -43,10 +43,7 @@ class CompositeHandlerMapping implements HandlerMapping {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public HandlerExecutionChain getHandler(HttpServletRequest request) throws Exception {
|
public HandlerExecutionChain getHandler(HttpServletRequest request) throws Exception {
|
||||||
if (this.mappings == null) {
|
for (HandlerMapping mapping : getMappings()) {
|
||||||
this.mappings = extractMappings();
|
|
||||||
}
|
|
||||||
for (HandlerMapping mapping : this.mappings) {
|
|
||||||
HandlerExecutionChain handler = mapping.getHandler(request);
|
HandlerExecutionChain handler = mapping.getHandler(request);
|
||||||
if (handler != null) {
|
if (handler != null) {
|
||||||
return handler;
|
return handler;
|
||||||
@ -55,6 +52,23 @@ class CompositeHandlerMapping implements HandlerMapping {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean usesPathPatterns() {
|
||||||
|
for (HandlerMapping mapping : getMappings()) {
|
||||||
|
if (mapping.usesPathPatterns()) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<HandlerMapping> getMappings() {
|
||||||
|
if (this.mappings == null) {
|
||||||
|
this.mappings = extractMappings();
|
||||||
|
}
|
||||||
|
return this.mappings;
|
||||||
|
}
|
||||||
|
|
||||||
private List<HandlerMapping> extractMappings() {
|
private List<HandlerMapping> extractMappings() {
|
||||||
List<HandlerMapping> list = new ArrayList<>(this.beanFactory.getBeansOfType(HandlerMapping.class).values());
|
List<HandlerMapping> list = new ArrayList<>(this.beanFactory.getBeansOfType(HandlerMapping.class).values());
|
||||||
list.remove(this);
|
list.remove(this);
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2019 the original author or authors.
|
* Copyright 2012-2021 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -22,8 +22,6 @@ import org.junit.jupiter.api.Test;
|
|||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.boot.actuate.autoconfigure.web.server.LocalManagementPort;
|
import org.springframework.boot.actuate.autoconfigure.web.server.LocalManagementPort;
|
||||||
import org.springframework.boot.test.context.SpringBootTest;
|
|
||||||
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
|
|
||||||
import org.springframework.boot.test.web.client.TestRestTemplate;
|
import org.springframework.boot.test.web.client.TestRestTemplate;
|
||||||
import org.springframework.boot.web.server.LocalServerPort;
|
import org.springframework.boot.web.server.LocalServerPort;
|
||||||
import org.springframework.core.env.Environment;
|
import org.springframework.core.env.Environment;
|
||||||
@ -33,13 +31,11 @@ import org.springframework.http.ResponseEntity;
|
|||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Integration tests for separate management and main service ports.
|
* Base class for integration tests with separate management and main service ports.
|
||||||
*
|
*
|
||||||
* @author Dave Syer
|
* @author Dave Syer
|
||||||
*/
|
*/
|
||||||
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = { "management.server.port=0",
|
abstract class AbstractManagementPortAndPathSampleActuatorApplicationTests {
|
||||||
"management.endpoints.web.base-path=/admin", "management.endpoint.health.show-details=never" })
|
|
||||||
class ManagementPortAndPathSampleActuatorApplicationTests {
|
|
||||||
|
|
||||||
@LocalServerPort
|
@LocalServerPort
|
||||||
private int port;
|
private int port;
|
@ -0,0 +1,32 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2012-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 smoketest.actuator;
|
||||||
|
|
||||||
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
|
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Integration tests for separate management and main service ports.
|
||||||
|
*
|
||||||
|
* @author Dave Syer
|
||||||
|
*/
|
||||||
|
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = { "management.server.port=0",
|
||||||
|
"management.endpoints.web.base-path=/admin", "management.endpoint.health.show-details=never" })
|
||||||
|
class ManagementPortAndPathWithAntPatcherSampleActuatorApplicationTests
|
||||||
|
extends AbstractManagementPortAndPathSampleActuatorApplicationTests {
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,33 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2012-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 smoketest.actuator;
|
||||||
|
|
||||||
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
|
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Integration tests for separate management and main service ports.
|
||||||
|
*
|
||||||
|
* @author Dave Syer
|
||||||
|
*/
|
||||||
|
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT,
|
||||||
|
properties = { "spring.mvc.pathmatch.matching-strategy=path-pattern-parser", "management.server.port=0",
|
||||||
|
"management.endpoints.web.base-path=/admin", "management.endpoint.health.show-details=never" })
|
||||||
|
class ManagementPortAndPathWithPathMatcherSampleActuatorApplicationTests
|
||||||
|
extends AbstractManagementPortAndPathSampleActuatorApplicationTests {
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user