Polish "Deprecate SockJsServiceRegistration#setSupressCors"

See gh-28853
spring-projects · Jul 22, 2022 · 421b5cb · 421b5cb
1 parent 1cc36e5
commit 421b5cb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/...main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.java b/...main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.java
@@ -250,24 +250,23 @@ 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
-	 * @deprecated as of 5.3.23, in favor of {@link #setSuppressCors(boolean)},
-	 * to be removed in Spring Framework 6.0
+	 * @since 5.3.23
 	 */
-	@Deprecated
-	public SockJsServiceRegistration setSupressCors(boolean suppressCors) {
-		return this.setSuppressCors(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 (was named {@code setSupressCors} prior to 5.3.23)
+	 * @since 4.1.2
+	 * @deprecated as of 5.3.23, in favor of {@link #setSuppressCors(boolean)}
 	 */
-	public SockJsServiceRegistration setSuppressCors(boolean suppressCors) {
-		this.suppressCors = suppressCors;
-		return this;
+	@Deprecated
+	public SockJsServiceRegistration setSupressCors(boolean suppressCors) {
+		return this.setSuppressCors(suppressCors);
 	}
 
 	/**

diff --git a/...framework/web/socket/config/annotation/WebMvcStompWebSocketEndpointRegistrationTests.java b/...framework/web/socket/config/annotation/WebMvcStompWebSocketEndpointRegistrationTests.java
@@ -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.