Browse Source

Merge branch '5.3.x'

pull/28863/head
Stephane Nicoll 3 years ago
parent
commit
ae6a464a80
  1. 4
      spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.java
  2. 4
      spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebMvcStompWebSocketEndpointRegistrationTests.java

4
spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.java

@ -250,9 +250,9 @@ public class SockJsServiceRegistration { @@ -250,9 +250,9 @@ public class SockJsServiceRegistration {
* This option can be used to disable automatic addition of CORS headers for
* SockJS requests.
* <p>The default value is "false".
* @since 4.1.2
* @since 5.3.23
*/
public SockJsServiceRegistration setSupressCors(boolean suppressCors) {
public SockJsServiceRegistration setSuppressCors(boolean suppressCors) {
this.suppressCors = suppressCors;
return this;
}

4
spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebMvcStompWebSocketEndpointRegistrationTests.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2022 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.
@ -166,7 +166,7 @@ public class WebMvcStompWebSocketEndpointRegistrationTests { @@ -166,7 +166,7 @@ public class WebMvcStompWebSocketEndpointRegistrationTests {
WebMvcStompWebSocketEndpointRegistration registration =
new WebMvcStompWebSocketEndpointRegistration(new String[] {"/foo"}, this.handler, this.scheduler);
registration.withSockJS().setSupressCors(true);
registration.withSockJS().setSuppressCors(true);
MultiValueMap<HttpRequestHandler, String> mappings = registration.getMappings();
assertThat(mappings.size()).isEqualTo(1);

Loading…
Cancel
Save