Skip to content

Commit f3084a2

Browse files
committed
Fix: Move @Suppress("DEPRECATION") to specific methods in HeadersDsl
1 parent 66d735b commit f3084a2

2 files changed

Lines changed: 4 additions & 265 deletions

File tree

config/src/main/kotlin/org/springframework/security/config/annotation/web/HeadersDsl.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,17 @@ import org.springframework.security.web.header.writers.frameoptions.XFrameOption
3131
* @property defaultsDisabled whether all of the default headers should be included in the response
3232
*/
3333
@SecurityMarker
34-
@Suppress("DEPRECATION")
3534
class HeadersDsl {
3635
private var contentTypeOptions: ((HeadersConfigurer<HttpSecurity>.ContentTypeOptionsConfig) -> Unit)? = null
3736
private var xssProtection: ((HeadersConfigurer<HttpSecurity>.XXssConfig) -> Unit)? = null
3837
private var cacheControl: ((HeadersConfigurer<HttpSecurity>.CacheControlConfig) -> Unit)? = null
3938
private var hsts: ((HeadersConfigurer<HttpSecurity>.HstsConfig) -> Unit)? = null
4039
private var frameOptions: ((HeadersConfigurer<HttpSecurity>.FrameOptionsConfig) -> Unit)? = null
40+
@Suppress("DEPRECATION")
4141
private var hpkp: ((HeadersConfigurer<HttpSecurity>.HpkpConfig) -> Unit)? = null
4242
private var contentSecurityPolicy: ((HeadersConfigurer<HttpSecurity>.ContentSecurityPolicyConfig) -> Unit)? = null
4343
private var referrerPolicy: ((HeadersConfigurer<HttpSecurity>.ReferrerPolicyConfig) -> Unit)? = null
44+
@Suppress("DEPRECATION")
4445
private var featurePolicyDirectives: String? = null
4546
private var permissionsPolicy: ((HeadersConfigurer<HttpSecurity>.PermissionsPolicyConfig) -> Unit)? = null
4647
private var crossOriginOpenerPolicy: ((HeadersConfigurer<HttpSecurity>.CrossOriginOpenerPolicyConfig) -> Unit)? = null
@@ -121,6 +122,7 @@ class HeadersDsl {
121122
* @deprecated see <a href="https://owasp.org/www-community/controls/Certificate_and_Public_Key_Pinning">Certificate and Public Key Pinning</a> for more context
122123
*/
123124
@Deprecated(message = "as of 5.8 with no replacement")
125+
@Suppress("DEPRECATION")
124126
fun httpPublicKeyPinning(hpkpConfig: HttpPublicKeyPinningDsl.() -> Unit) {
125127
this.hpkp = HttpPublicKeyPinningDsl().apply(hpkpConfig).get()
126128
}
@@ -168,6 +170,7 @@ class HeadersDsl {
168170
* @param policyDirectives policyDirectives the security policy directive(s)
169171
*/
170172
@Deprecated("Use 'permissionsPolicy { }' instead.")
173+
@Suppress("DEPRECATION")
171174
fun featurePolicy(policyDirectives: String) {
172175
this.featurePolicyDirectives = policyDirectives
173176
}

0 commit comments

Comments
 (0)