Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-2752: RequestMapping: react only for our event

Browse Source 
Fixes https://github.com/spring-projects/spring-integration/issues/2752

The logic in the `IntegrationRequestMappingHandlerMapping` fully depends
on the application context it has been registered with, therefore any
arbitrary `ContextRefreshedEvent` doesn't fit our requirements.
More over it may cause a problem with missed mappings when parent-child
configuration is used.

**Chery-pick to 5.1.x, 5.0.x & 4.3.x**
This commit is contained in:
Artem Bilan
2019-02-19 15:06:40 -05:00
committed by Gary Russell
parent 9e238f5d69
commit baf1b971c8
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-integration-http/src/main/java/org/springframework/integration/http/inbound/IntegrationRequestMappingHandlerMapping.java
View File

@@ -234,11 +234,6 @@ public final class IntegrationRequestMappingHandlerMapping extends RequestMappin
return createRequestMappingInfo(requestMappingAnnotation, getCustomTypeCondition(endpoint.getClass()));
}
@Override
public void afterPropertiesSet() {
// No-op in favor of onApplicationEvent
}
/**
* {@link HttpRequestHandlingEndpointSupport}s may depend on auto-created
* {@code requestChannel}s, so MVC Handlers detection should be postponed
@@ -247,9 +242,14 @@ public final class IntegrationRequestMappingHandlerMapping extends RequestMappin
*/
@Override
public void onApplicationEvent(ContextRefreshedEvent event) {
if (!this.initialized.getAndSet(true)) {
if (event.getApplicationContext().equals(getApplicationContext()) && !this.initialized.getAndSet(true)) {
super.afterPropertiesSet();
}
}
@Override
public void afterPropertiesSet() {
// No-op in favor of onApplicationEvent
}
}

4
spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/WebFluxIntegrationRequestMappingHandlerMapping.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2017-2018 the original author or authors.
* Copyright 2017-2019 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.
@@ -191,7 +191,7 @@ public class WebFluxIntegrationRequestMappingHandlerMapping extends RequestMappi
*/
@Override
public void onApplicationEvent(ContextRefreshedEvent event) {
if (!this.initialized.getAndSet(true)) {
if (event.getApplicationContext().equals(getApplicationContext()) && !this.initialized.getAndSet(true)) {
super.afterPropertiesSet();
}
}