From 12150812f2ffca8a071b0cceba305d1a4fbeac83 Mon Sep 17 00:00:00 2001 From: Daniel Garnier-Moiroux Date: Mon, 19 Aug 2024 15:48:34 +0200 Subject: [PATCH] Fix checkstyle errors with @Deprecated --- .../annotation/web/configurers/saml2/Saml2LoginConfigurer.java | 1 - .../main/java/org/springframework/security/ldap/LdapUtils.java | 1 - .../security/ldap/userdetails/LdapUserDetailsManager.java | 1 - 3 files changed, 3 deletions(-) diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java index 8c3bf14b5be..468afafad4e 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java @@ -197,7 +197,6 @@ public Saml2LoginConfigurer authenticationRequestResolver( * @return the {@link Saml2LoginConfigurer} for further configuration * @since 6.0 */ - @Deprecated public Saml2LoginConfigurer authenticationRequestUri(String authenticationRequestUri) { Assert.state(authenticationRequestUri.contains("{registrationId}"), "authenticationRequestUri must contain {registrationId} path variable"); diff --git a/ldap/src/main/java/org/springframework/security/ldap/LdapUtils.java b/ldap/src/main/java/org/springframework/security/ldap/LdapUtils.java index d2903e882d6..5909eb8f7aa 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/LdapUtils.java +++ b/ldap/src/main/java/org/springframework/security/ldap/LdapUtils.java @@ -97,7 +97,6 @@ public static String getRelativeName(String fullDn, Context baseCtx) throws Nami /** * Gets the full dn of a name by prepending the name of the context it is relative to. * If the name already contains the base name, it is returned unaltered. - * @deprecated Use {@link #getFullDn(LdapName, Context)} */ public static DistinguishedName getFullDn(DistinguishedName dn, Context baseCtx) throws NamingException { DistinguishedName baseDn = new DistinguishedName(baseCtx.getNameInNamespace()); diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java index 2e415ed16c0..cb3d4c3ff08 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java @@ -284,7 +284,6 @@ public boolean userExists(String username) { * Creates a DN from a group name. * @param group the name of the group * @return the DN of the corresponding group, including the groupSearchBase - * @deprecated */ protected DistinguishedName buildGroupDn(String group) { DistinguishedName dn = new DistinguishedName(this.groupSearchBase);