Align names to be more consistent

Author: fhanik

samples/service-provider/starter/src/main/java/org/springframework/security/config/annotation/web/configurers/Saml2ServiceProviderConfigurer.java

@@ -27,12 +27,12 @@
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.saml2.serviceprovider.authentication.DefaultSaml2AuthenticationRequestResolver;
-import org.springframework.security.saml2.serviceprovider.authentication.Saml2AuthenticationProvider;
+import org.springframework.security.saml2.serviceprovider.authentication.OpenSamlAuthenticationRequestResolver;
+import org.springframework.security.saml2.serviceprovider.authentication.OpenSamlAuthenticationProvider;
 import org.springframework.security.saml2.serviceprovider.authentication.Saml2AuthenticationRequestResolver;
 import org.springframework.security.saml2.serviceprovider.provider.Saml2IdentityProviderDetails;
 import org.springframework.security.saml2.serviceprovider.provider.Saml2IdentityProviderDetailsRepository;
-import org.springframework.security.saml2.serviceprovider.servlet.filter.Saml2AuthenticationRequestFilter;
+import org.springframework.security.saml2.serviceprovider.servlet.filter.Saml2WebSsoAuthenticationRequestFilter;
 import org.springframework.security.saml2.serviceprovider.servlet.filter.Saml2LoginPageGeneratingFilter;
 import org.springframework.security.saml2.serviceprovider.servlet.filter.Saml2WebSsoAuthenticationFilter;
 import org.springframework.security.web.AuthenticationEntryPoint;
@@ -108,7 +108,7 @@ public void init(HttpSecurity builder) throws Exception {
 		);
 
 		if (authenticationProvider == null) {
-			authenticationProvider = new Saml2AuthenticationProvider();
+			authenticationProvider = new OpenSamlAuthenticationProvider();
 		}
 		builder.authenticationProvider(postProcess(authenticationProvider));
 
@@ -126,7 +126,7 @@ public void init(HttpSecurity builder) throws Exception {
 
 		authenticationRequestResolver = getSharedObject(builder,
 			Saml2AuthenticationRequestResolver.class,
-			() -> new DefaultSaml2AuthenticationRequestResolver(),
+			() -> new OpenSamlAuthenticationRequestResolver(),
 			authenticationRequestResolver
 		);
 	}
@@ -139,7 +139,7 @@ public void configure(HttpSecurity builder) throws Exception {
 	}
 
 	protected void configureSaml2AuthenticationRequestFilter(HttpSecurity builder, String filterUrl) {
-		Filter authenticationRequestFilter = new Saml2AuthenticationRequestFilter(
+		Filter authenticationRequestFilter = new Saml2WebSsoAuthenticationRequestFilter(
 			filterUrl,
 			"{baseUrl}" + filterPrefix + "/SSO/{alias}",
 			providerDetailsRepository,

samples/service-provider/starter/src/main/java/org/springframework/security/saml2/serviceprovider/authentication/Saml2AuthenticationProvider.java renamed to samples/service-provider/starter/src/main/java/org/springframework/security/saml2/serviceprovider/authentication/OpenSamlAuthenticationProvider.java

@@ -81,11 +81,11 @@
 import static org.springframework.util.Assert.notNull;
 import static org.springframework.util.StringUtils.hasText;
 
-public class Saml2AuthenticationProvider implements AuthenticationProvider {
+public class OpenSamlAuthenticationProvider implements AuthenticationProvider {
 
-	private static Log logger = LogFactory.getLog(Saml2AuthenticationProvider.class);
+	private static Log logger = LogFactory.getLog(OpenSamlAuthenticationProvider.class);
 
-	private final OpenSaml2Implementation saml = OpenSaml2Implementation.getInstance();
+	private final OpenSamlImplementation saml = OpenSamlImplementation.getInstance();
 
 	private GrantedAuthoritiesMapper authoritiesMapper = (a -> a);
 

samples/service-provider/starter/src/main/java/org/springframework/security/saml2/serviceprovider/authentication/DefaultSaml2AuthenticationRequestResolver.java renamed to samples/service-provider/starter/src/main/java/org/springframework/security/saml2/serviceprovider/authentication/OpenSamlAuthenticationRequestResolver.java

@@ -20,18 +20,16 @@
 import java.time.Clock;
 import java.util.UUID;
 
-import org.springframework.security.saml2.serviceprovider.provider.Saml2IdentityProviderDetails;
-
 import org.joda.time.DateTime;
 import org.opensaml.core.xml.io.MarshallingException;
 import org.opensaml.saml.saml2.core.AuthnRequest;
 import org.opensaml.saml.saml2.core.Issuer;
 import org.opensaml.security.SecurityException;
 import org.opensaml.xmlsec.signature.support.SignatureException;
 
-public class DefaultSaml2AuthenticationRequestResolver implements Saml2AuthenticationRequestResolver{
+public class OpenSamlAuthenticationRequestResolver implements Saml2AuthenticationRequestResolver{
 	private final Clock clock = Clock.systemUTC();
-	private final OpenSaml2Implementation saml = OpenSaml2Implementation.getInstance();
+	private final OpenSamlImplementation saml = OpenSamlImplementation.getInstance();
 
 	@Override
 	public String resolveAuthenticationRequest(Saml2AuthenticationRequest request) {

samples/service-provider/starter/src/main/java/org/springframework/security/saml2/serviceprovider/authentication/OpenSaml2Implementation.java renamed to samples/service-provider/starter/src/main/java/org/springframework/security/saml2/serviceprovider/authentication/OpenSamlImplementation.java

@@ -65,8 +65,8 @@
 import static java.util.Arrays.asList;
 import static org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport.getBuilderFactory;
 
-final class OpenSaml2Implementation {
-	private static OpenSaml2Implementation instance = new OpenSaml2Implementation();
+final class OpenSamlImplementation {
+	private static OpenSamlImplementation instance = new OpenSamlImplementation();
 
 	private final BasicParserPool parserPool = new BasicParserPool();
 
@@ -78,15 +78,15 @@ final class OpenSaml2Implementation {
 			)
 	);
 
-	private OpenSaml2Implementation() {
+	private OpenSamlImplementation() {
 		bootstrap();
 	}
 	/*
 	 * ==============================================================
 	 * PUBLIC METHODS
 	 * ==============================================================
 	 */
-	static OpenSaml2Implementation getInstance() {
+	static OpenSamlImplementation getInstance() {
 		return instance;
 	}
 

samples/service-provider/starter/src/main/java/org/springframework/security/saml2/serviceprovider/servlet/filter/Saml2AuthenticationRequestFilter.java renamed to samples/service-provider/starter/src/main/java/org/springframework/security/saml2/serviceprovider/servlet/filter/Saml2WebSsoAuthenticationRequestFilter.java

@@ -40,17 +40,17 @@
 import static org.springframework.util.Assert.hasText;
 import static org.springframework.util.Assert.state;
 
-public class Saml2AuthenticationRequestFilter extends OncePerRequestFilter {
+public class Saml2WebSsoAuthenticationRequestFilter extends OncePerRequestFilter {
 
 	private final AntPathRequestMatcher matcher;
 	private final Saml2IdentityProviderDetailsRepository providerRepository;
 	private Saml2AuthenticationRequestResolver authenticationRequestResolver;
 	private final String webSsoUriTemplate;
 
-	public Saml2AuthenticationRequestFilter(String filterProcessesUrl,
-											String webSsoUriTemplate,
-											Saml2IdentityProviderDetailsRepository providerRepository,
-											Saml2AuthenticationRequestResolver authenticationRequestResolver) {
+	public Saml2WebSsoAuthenticationRequestFilter(String filterProcessesUrl,
+												  String webSsoUriTemplate,
+												  Saml2IdentityProviderDetailsRepository providerRepository,
+												  Saml2AuthenticationRequestResolver authenticationRequestResolver) {
 		hasText(filterProcessesUrl, "filterProcessesUrl must contain an {alias} matcher parameter");
 		state(filterProcessesUrl.contains("{alias}"), "filterProcessesUrl must contain an {alias} matcher parameter");
 		this.matcher = new AntPathRequestMatcher(filterProcessesUrl);

samples/service-provider/starter/src/test/java/org/springframework/security/saml2/serviceprovider/authentication/OpenSaml2ImplementationTests.java renamed to samples/service-provider/starter/src/test/java/org/springframework/security/saml2/serviceprovider/authentication/OpenSamlImplementationTests.java

@@ -19,12 +19,10 @@
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
-
-class OpenSaml2ImplementationTests {
+class OpenSamlImplementationTests {
 
 	@Test
 	void getInstance() {
-		OpenSaml2Implementation.getInstance();
+		OpenSamlImplementation.getInstance();
 	}
 }