Merge branch '7.0.x'

Author: rstoyanchev

spring-messaging/src/main/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistry.java

@@ -74,7 +74,8 @@ public class DefaultSubscriptionRegistry extends AbstractSubscriptionRegistry {
 
 	/** Static evaluation context to reuse. */
 	private static final EvaluationContext messageEvalContext =
-			SimpleEvaluationContext.forPropertyAccessors(new SimpMessageHeaderPropertyAccessor()).build();
+			SimpleEvaluationContext.forPropertyAccessors(new SimpMessageHeaderPropertyAccessor())
+					.withAssignmentDisabled().build();
 
 
 	private PathMatcher pathMatcher = new AntPathMatcher();

spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java

@@ -456,7 +456,7 @@ protected void startInternal() {
 		accessor.setLogin(this.systemLogin);
 		accessor.setPasscode(this.systemPasscode);
 		accessor.setHeartbeat(this.systemHeartbeatSendInterval, this.systemHeartbeatReceiveInterval);
-		accessor.setHost(getVirtualHost() != null ? getVirtualHost() : getRelayHost());
+		accessor.setHost(getVirtualHost() != null ? getVirtualHost() : null);
 		accessor.setSessionId(SYSTEM_SESSION_ID);
 		if (logger.isDebugEnabled()) {
 			logger.debug("Forwarding " + accessor.getShortLogMessage(EMPTY_PAYLOAD));
@@ -579,7 +579,7 @@ else if (accessor instanceof SimpMessageHeaderAccessor) {
 			stompHeaderAccessor = (stompHeaderAccessor.isMutable() ? stompHeaderAccessor : StompHeaderAccessor.wrap(message));
 			stompHeaderAccessor.setLogin(this.clientLogin);
 			stompHeaderAccessor.setPasscode(this.clientPasscode);
-			stompHeaderAccessor.setHost(getVirtualHost() != null ? getVirtualHost() : getRelayHost());
+			stompHeaderAccessor.setHost(getVirtualHost() != null ? getVirtualHost() : null);
 			RelayConnectionHandler handler = new RelayConnectionHandler(sessionId, stompHeaderAccessor);
 			this.connectionHandlers.put(sessionId, handler);
 			this.stats.incrementConnectCount();

spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerTests.java

@@ -98,6 +98,27 @@ void virtualHost() {
 		assertThat(headers2.getHost()).isEqualTo("ABC");
 	}
 
+	@Test
+	void virtualHostDefault() {
+		Message<byte[]> connectMessage = connectMessage("sess1", "joe");
+		MessageHeaderAccessor.getAccessor(connectMessage, StompHeaderAccessor.class).setHost("ABC");
+
+		this.brokerRelay.start();
+		this.brokerRelay.handleMessage(connectMessage("sess1", "joe"));
+
+		assertThat(this.tcpClient.getSentMessages()).hasSize(2);
+
+		StompHeaderAccessor headers1 = this.tcpClient.getSentHeaders(0);
+		assertThat(headers1.getCommand()).isEqualTo(StompCommand.CONNECT);
+		assertThat(headers1.getSessionId()).isEqualTo(StompBrokerRelayMessageHandler.SYSTEM_SESSION_ID);
+		assertThat(headers1.getHost()).isNull();
+
+		StompHeaderAccessor headers2 = this.tcpClient.getSentHeaders(1);
+		assertThat(headers2.getCommand()).isEqualTo(StompCommand.CONNECT);
+		assertThat(headers2.getSessionId()).isEqualTo("sess1");
+		assertThat(headers2.getHost()).isNull();
+	}
+
 	@Test
 	void loginAndPasscode() {
 		this.brokerRelay.setSystemLogin("syslogin");

spring-web/src/main/java/org/springframework/http/server/reactive/ReactorUriHelper.java

@@ -135,19 +135,25 @@ private static void appendRequestUri(HttpServerRequest request, StringBuilder bu
 			if (c == '/' || c == '?' || c == '#') {
 				break;
 			}
-			if (c == ':' && (i + 2 < length)) {
-				if (uri.charAt(i + 1) == '/' && uri.charAt(i + 2) == '/') {
-					for (int j = i + 3; j < length; j++) {
-						c = uri.charAt(j);
-						if (c == '/' || c == '?' || c == '#') {
-							builder.append(uri, j, length);
-							return;
-						}
+			if (hasAuthority(uri, c, i, length)) {
+				for (i = i + 3; i < length; i++) {
+					c = uri.charAt(i);
+					if (c == '/' || c == '?' || c == '#') {
+						builder.append(uri, i, length);
+						return;
 					}
-					return;
 				}
+				return;
 			}
 		}
+		if (length > 0 && uri.charAt(0) != '/') {
+			builder.append('/');
+		}
 		builder.append(uri);
 	}
+
+	private static boolean hasAuthority(String uri, char c, int i, int length) {
+		return (c == ':' && (i + 2 < length) && (uri.charAt(i + 1) == '/' && uri.charAt(i + 2) == '/'));
+	}
+
 }

spring-web/src/main/java/org/springframework/web/accept/AbstractMappingContentNegotiationStrategy.java

@@ -148,9 +148,11 @@ protected void handleMatch(String key, MediaType mediaType) {
 			throws HttpMediaTypeNotAcceptableException {
 
 		if (!isUseRegisteredExtensionsOnly()) {
-			Optional<MediaType> mediaType = MediaTypeFactory.getMediaType("file." + key);
-			if (mediaType.isPresent()) {
-				return mediaType.get();
+			if (key.indexOf('.') == -1) {
+				Optional<MediaType> mediaType = MediaTypeFactory.getMediaType("file." + key);
+				if (mediaType.isPresent()) {
+					return mediaType.get();
+				}
 			}
 		}
 		if (isIgnoreUnknownExtensions()) {

spring-web/src/main/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolver.java

@@ -57,12 +57,7 @@ public class MappingMediaTypeFileExtensionResolver implements MediaTypeFileExten
 	public MappingMediaTypeFileExtensionResolver(@Nullable Map<String, MediaType> mediaTypes) {
 		if (mediaTypes != null) {
 			Set<String> allFileExtensions = CollectionUtils.newHashSet(mediaTypes.size());
-			mediaTypes.forEach((extension, mediaType) -> {
-				String lowerCaseExtension = extension.toLowerCase(Locale.ROOT);
-				this.mediaTypes.put(lowerCaseExtension, mediaType);
-				addFileExtension(mediaType, lowerCaseExtension);
-				allFileExtensions.add(lowerCaseExtension);
-			});
+			mediaTypes.forEach(this::addMapping);
 			this.allFileExtensions.addAll(allFileExtensions);
 		}
 	}
@@ -79,19 +74,15 @@ protected List<MediaType> getAllMediaTypes() {
 	/**
 	 * Map an extension to a MediaType. Ignore if extension already mapped.
 	 */
-	protected void addMapping(String extension, MediaType mediaType) {
-		MediaType previous = this.mediaTypes.putIfAbsent(extension, mediaType);
+	protected void addMapping(String key, MediaType mediaType) {
+		key = key.toLowerCase(Locale.ROOT);
+		MediaType previous = this.mediaTypes.putIfAbsent(key, mediaType);
 		if (previous == null) {
-			addFileExtension(mediaType, extension);
-			this.allFileExtensions.add(extension);
+			this.fileExtensions.computeIfAbsent(mediaType, k -> new CopyOnWriteArrayList<>()).add(key);
+			this.allFileExtensions.add(key);
 		}
 	}
 
-	private void addFileExtension(MediaType mediaType, String extension) {
-		this.fileExtensions.computeIfAbsent(mediaType, key -> new CopyOnWriteArrayList<>())
-				.add(extension);
-	}
-
 
 	@Override
 	public List<String> resolveFileExtensions(MediaType mediaType) {