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

Fix some tests race conditions

Browse Source 
* Fix unused import in the `IntegrationRequestMappingHandlerMapping`
* Fix deprecations from Reactor
* Fix race condition in the `AbstractCorrelatingMessageHandlerTests`:
 the discard message is sent much earlier than group is removed from the store.
Iterate group count call until it pass or 10 seconds timeout
* Remove list size assert in the `FtpServerOutboundTests`: looks like
it is not updated properly even if we have an expected content in the collection
* Increase timeout to assert remote files removal in the `FtpRemoteFileTemplateTests`
This commit is contained in:
Artem Bilan
2020-09-12 11:58:57 -04:00
parent c36314d6ec
commit 5bac9bf66e
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,6 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.servlet.http.HttpServletRequest;
@@ -81,7 +80,7 @@ import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandl
* them during the {@link BaseHttpInboundEndpoint} destruction.
*<p>
* This class extends the Spring MVC {@link RequestMappingHandlerMapping} class, inheriting
* most of its logic, especially {@link #handleNoMatch(Set, String, HttpServletRequest)},
* most of its logic, especially {@link #handleNoMatch(java.util.Set, String, HttpServletRequest)},
* which throws a specific {@code 4xx} error for the HTTP response, when mapping doesn't match
* for some reason, preventing calls to any remaining mapping handlers in the application context.
* For this reason, configuring the same path for both Spring Integration and