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

Start version 6.4

Browse Source 
* Move `whats-new` to `changes-6.2-6.3.adoc`
* Upgrade dependency to the latest (including Gradle)
* Move Spring dependencies to based on SF-6.2
* Fix some deprecations and incompatibility
This commit is contained in:
Artem Bilan
2024-05-28 20:07:35 -04:00
parent dc96ff6a2d
commit 8b2da4f996
18 changed files with 150 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
spring-integration-websocket/src/main/java/org/springframework/integration/websocket/config/IntegrationDynamicWebSocketHandlerMapping.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2021 the original author or authors.
* Copyright 2021-2024 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.
@@ -16,27 +16,11 @@
package org.springframework.integration.websocket.config;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import jakarta.servlet.http.HttpServletRequest;
import org.springframework.http.server.PathContainer;
import org.springframework.http.server.RequestPath;
import org.springframework.web.HttpRequestHandler;
import org.springframework.web.servlet.HandlerExecutionChain;
import org.springframework.web.servlet.handler.AbstractUrlHandlerMapping;
import org.springframework.web.util.ServletRequestPathUtils;
import org.springframework.web.util.pattern.PathPattern;
import org.springframework.web.util.pattern.PathPatternParser;
/**
* The {@link AbstractUrlHandlerMapping} implementation for dynamic WebSocket endpoint registrations in Spring Integration.
* <p>
* TODO until https://github.com/spring-projects/spring-framework/issues/26798
*
* @author Artem Bilan
*
@@ -44,58 +28,4 @@ import org.springframework.web.util.pattern.PathPatternParser;
*/
class IntegrationDynamicWebSocketHandlerMapping extends AbstractUrlHandlerMapping {
private final Map<String, HttpRequestHandler> handlerMap = new HashMap<>();
private final Map<PathPattern, HttpRequestHandler> pathPatternHandlerMap = new LinkedHashMap<>();
@Override
protected Object getHandlerInternal(HttpServletRequest request) {
String lookupPath = initLookupPath(request);
HttpRequestHandler httpRequestHandler = this.handlerMap.get(lookupPath);
if (httpRequestHandler == null && usesPathPatterns()) {
RequestPath path = ServletRequestPathUtils.getParsedRequestPath(request);
return lookupByPattern(path);
}
return httpRequestHandler != null ? new HandlerExecutionChain(httpRequestHandler) : null;
}
private Object lookupByPattern(RequestPath path) {
List<PathPattern> matches = null;
for (PathPattern pattern : this.pathPatternHandlerMap.keySet()) {
if (pattern.matches(path.pathWithinApplication())) {
matches = (matches != null ? matches : new ArrayList<>());
matches.add(pattern);
}
}
if (matches == null) {
return null;
}
if (matches.size() > 1) {
matches.sort(PathPattern.SPECIFICITY_COMPARATOR);
if (logger.isTraceEnabled()) {
logger.trace("Matching patterns " + matches);
}
}
PathPattern pattern = matches.get(0);
HttpRequestHandler handler = this.pathPatternHandlerMap.get(pattern);
PathContainer pathWithinMapping = pattern.extractPathWithinPattern(path.pathWithinApplication());
return buildPathExposingHandler(handler, pattern.getPatternString(), pathWithinMapping.value(), null);
}
void registerHandler(String path, HttpRequestHandler httpHandler) {
this.handlerMap.put(path, httpHandler);
PathPatternParser patternParser = getPatternParser();
if (patternParser != null) {
this.pathPatternHandlerMap.put(patternParser.parse(path), httpHandler);
}
}
void unregisterHandler(String path) {
this.handlerMap.remove(path);
PathPatternParser patternParser = getPatternParser();
if (patternParser != null) {
this.pathPatternHandlerMap.remove(patternParser.parse(path));
}
}
}