Skip to content

Commit b9f974b

Browse files
023-devrwinch
023-dev
authored and
rwinch
committed
Remove compiler warnings for spring-security-config
Signed-off-by: 023-dev <0_2_3@naver.com>
1 parent e43275d commit b9f974b

47 files changed

Lines changed: 102 additions & 13 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎buildSrc/src/main/groovy/compile-warnings-error.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ tasks.withType(JavaCompile) {
88
tasks.withType(KotlinCompile) {
99
kotlinOptions.allWarningsAsErrors = true
1010
}
11+

‎config/spring-security-config.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ apply plugin: 'io.spring.convention.spring-module'
55
apply plugin: 'trang'
66
apply plugin: 'security-kotlin'
77
apply plugin: 'test-compile-target-jdk25'
8+
apply plugin: 'compile-warnings-error'
89
apply plugin: 'javadoc-warnings-error'
910

1011
configurations {

‎config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurer.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -521,8 +521,10 @@ public OpaqueTokenConfigurer authenticationManager(AuthenticationManager authent
521521
public OpaqueTokenConfigurer introspectionUri(String introspectionUri) {
522522
Assert.notNull(introspectionUri, "introspectionUri cannot be null");
523523
this.introspectionUri = introspectionUri;
524-
this.introspector = () -> new SpringOpaqueTokenIntrospector(this.introspectionUri, this.clientId,
525-
this.clientSecret);
524+
this.introspector = () -> SpringOpaqueTokenIntrospector.withIntrospectionUri(this.introspectionUri)
525+
.clientId(this.clientId)
526+
.clientSecret(this.clientSecret)
527+
.build();
526528
return this;
527529
}
528530

@@ -531,8 +533,10 @@ public OpaqueTokenConfigurer introspectionClientCredentials(String clientId, Str
531533
Assert.notNull(clientSecret, "clientSecret cannot be null");
532534
this.clientId = clientId;
533535
this.clientSecret = clientSecret;
534-
this.introspector = () -> new SpringOpaqueTokenIntrospector(this.introspectionUri, this.clientId,
535-
this.clientSecret);
536+
this.introspector = () -> SpringOpaqueTokenIntrospector.withIntrospectionUri(this.introspectionUri)
537+
.clientId(this.clientId)
538+
.clientSecret(this.clientSecret)
539+
.build();
536540
return this;
537541
}
538542

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ class AuthorizeHttpRequestsDsl : AbstractRequestMatcherDsl {
286286
if (factoryOfRequestAuthorizationContext != null) {
287287
return factoryOfRequestAuthorizationContext
288288
}
289-
val factoryOfObjectType = ResolvableType.forClassWithGenerics(AuthorizationManagerFactory::class.java, Object::class.java)
289+
val factoryOfObjectType = ResolvableType.forClassWithGenerics(AuthorizationManagerFactory::class.java, Any::class.java)
290290
val factoryOfAny = context.getBeanProvider<AuthorizationManagerFactory<Any>>(factoryOfObjectType).getIfUnique()
291291
if (factoryOfAny != null) {
292292
return factoryOfAny
@@ -303,20 +303,20 @@ class AuthorizeHttpRequestsDsl : AbstractRequestMatcherDsl {
303303
return defaultFactory
304304
}
305305

306-
private fun resolveRolePrefix(context: ApplicationContext): String {
306+
private fun resolveRolePrefix(context: ApplicationContext): String? {
307307
val beanNames = context.getBeanNamesForType(GrantedAuthorityDefaults::class.java)
308308
if (beanNames.isNotEmpty()) {
309309
return context.getBean(GrantedAuthorityDefaults::class.java).rolePrefix
310310
}
311-
return "ROLE_";
311+
return null
312312
}
313313

314-
private fun resolveRoleHierarchy(context: ApplicationContext): RoleHierarchy {
314+
private fun resolveRoleHierarchy(context: ApplicationContext): RoleHierarchy? {
315315
val beanNames = context.getBeanNamesForType(RoleHierarchy::class.java)
316316
if (beanNames.isNotEmpty()) {
317317
return context.getBean(RoleHierarchy::class.java)
318318
}
319-
return NullRoleHierarchy()
319+
return null
320320
}
321321

322322
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@ class HeadersDsl {
3737
private var cacheControl: ((HeadersConfigurer<HttpSecurity>.CacheControlConfig) -> Unit)? = null
3838
private var hsts: ((HeadersConfigurer<HttpSecurity>.HstsConfig) -> Unit)? = null
3939
private var frameOptions: ((HeadersConfigurer<HttpSecurity>.FrameOptionsConfig) -> Unit)? = null
40+
@Suppress("DEPRECATION")
4041
private var hpkp: ((HeadersConfigurer<HttpSecurity>.HpkpConfig) -> Unit)? = null
4142
private var contentSecurityPolicy: ((HeadersConfigurer<HttpSecurity>.ContentSecurityPolicyConfig) -> Unit)? = null
4243
private var referrerPolicy: ((HeadersConfigurer<HttpSecurity>.ReferrerPolicyConfig) -> Unit)? = null
44+
@Suppress("DEPRECATION")
4345
private var featurePolicyDirectives: String? = null
4446
private var permissionsPolicy: ((HeadersConfigurer<HttpSecurity>.PermissionsPolicyConfig) -> Unit)? = null
4547
private var crossOriginOpenerPolicy: ((HeadersConfigurer<HttpSecurity>.CrossOriginOpenerPolicyConfig) -> Unit)? = null
@@ -120,6 +122,7 @@ class HeadersDsl {
120122
* @deprecated see <a href="https://owasp.org/www-community/controls/Certificate_and_Public_Key_Pinning">Certificate and Public Key Pinning</a> for more context
121123
*/
122124
@Deprecated(message = "as of 5.8 with no replacement")
125+
@Suppress("DEPRECATION")
123126
fun httpPublicKeyPinning(hpkpConfig: HttpPublicKeyPinningDsl.() -> Unit) {
124127
this.hpkp = HttpPublicKeyPinningDsl().apply(hpkpConfig).get()
125128
}
@@ -167,6 +170,7 @@ class HeadersDsl {
167170
* @param policyDirectives policyDirectives the security policy directive(s)
168171
*/
169172
@Deprecated("Use 'permissionsPolicy { }' instead.")
173+
@Suppress("DEPRECATION")
170174
fun featurePolicy(policyDirectives: String) {
171175
this.featurePolicyDirectives = policyDirectives
172176
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -614,6 +614,7 @@ class HttpSecurityDsl(private val http: HttpSecurity, private val init: HttpSecu
614614
* @see [RequiresChannelDsl]
615615
* @deprecated please use [redirectToHttps] instead
616616
*/
617+
@Suppress("DEPRECATION")
617618
@Deprecated(message="since 6.5 use redirectToHttps instead")
618619
fun requiresChannel(requiresChannelConfiguration: RequiresChannelDsl.() -> Unit) {
619620
val requiresChannelCustomizer = RequiresChannelDsl().apply(requiresChannelConfiguration).get()

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17+
@file:Suppress("DEPRECATION")
18+
1719
package org.springframework.security.config.annotation.web
1820

1921
import org.springframework.security.config.annotation.web.builders.HttpSecurity

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ class X509Dsl {
6262
authenticationDetailsSource?.also { x509.authenticationDetailsSource(authenticationDetailsSource) }
6363
userDetailsService?.also { x509.userDetailsService(userDetailsService) }
6464
authenticationUserDetailsService?.also { x509.authenticationUserDetailsService(authenticationUserDetailsService) }
65+
@Suppress("DEPRECATION")
6566
subjectPrincipalRegex?.also { x509.subjectPrincipalRegex(subjectPrincipalRegex) }
6667
}
6768
}

‎config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/HttpPublicKeyPinningDsl.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17+
@file:Suppress("DEPRECATION")
18+
1719
package org.springframework.security.config.annotation.web.headers
1820

1921
import org.springframework.security.config.annotation.web.builders.HttpSecurity

‎config/src/main/kotlin/org/springframework/security/config/annotation/web/session/SessionFixationDsl.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,11 @@ class SessionFixationDsl {
6868
internal fun get(): (SessionManagementConfigurer<HttpSecurity>.SessionFixationConfigurer) -> Unit {
6969
return { sessionFixation ->
7070
strategy?.also {
71-
when (strategy) {
71+
when (it) {
7272
SessionFixationStrategy.NEW -> sessionFixation.newSession()
7373
SessionFixationStrategy.MIGRATE -> sessionFixation.migrateSession()
7474
SessionFixationStrategy.CHANGE_ID -> sessionFixation.changeSessionId()
7575
SessionFixationStrategy.NONE -> sessionFixation.none()
76-
null -> null
7776
}
7877
}
7978
}

0 commit comments

Comments
 (0)