Skip to content

Commit

Permalink
Merge pull request #28853 from marcwrobel
Browse files Browse the repository at this point in the history
* pr/28853:
  Polish "Deprecate SockJsServiceRegistration#setSupressCors"
  Deprecate SockJsServiceRegistration#setSupressCors

Closes gh-28853
  • Loading branch information
snicoll committed Jul 22, 2022
2 parents f7c32d3 + 421b5cb commit 93760d1
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 4 deletions.
Expand Up @@ -250,13 +250,25 @@ protected SockJsServiceRegistration setAllowedOriginPatterns(String... allowedOr
* 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;
}

/**
* 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
* @deprecated as of 5.3.23, in favor of {@link #setSuppressCors(boolean)}
*/
@Deprecated
public SockJsServiceRegistration setSupressCors(boolean suppressCors) {
return this.setSuppressCors(suppressCors);
}

/**
* The codec to use for encoding and decoding SockJS messages.
* <p>By default {@code Jackson2SockJsMessageCodec} is used requiring the
Expand Down
@@ -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.
Expand Down Expand Up @@ -166,7 +166,7 @@ public void disableCorsWithSockJsService() {
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);
Expand Down

0 comments on commit 93760d1

Please sign in to comment.