Update Mockito Usage

Issue gh-13542

config/src/test/resources/org/springframework/security/config/http/HttpConfigTests-AuthorizationManager.xml

@@ -29,8 +29,8 @@
 	</http>
 
 	<b:bean id="ref" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.authorization.AuthorizationManager"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.authorization.AuthorizationManager" type="java.lang.Class"/>
+</b:bean>
 
 	<b:import resource="userservice.xml"/>
 </b:beans>

config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-RequestRejectedHandler.xml

@@ -27,6 +27,6 @@
 	<b:import resource="MiscHttpConfigTests-HttpFirewall.xml"/>
 
 	<b:bean id="requestRejectedHandler" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.web.firewall.RequestRejectedHandler"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.web.firewall.RequestRejectedHandler" type="java.lang.Class"/>
+</b:bean>
 </b:beans>

config/src/test/resources/org/springframework/security/config/http/OAuth2ClientBeanDefinitionParserTests-AuthorizedClientArgumentResolver.xml

@@ -44,7 +44,7 @@
 	</client-registrations>
 
 	<b:bean id="authorizedClientRepository" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository"/>
+    	<b:constructor-arg value="org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository" type="java.lang.Class"/>
 	</b:bean>
 
 	<b:bean name="authorizedClientController" class="org.springframework.security.config.http.OAuth2ClientBeanDefinitionParserTests.AuthorizedClientController" />

config/src/test/resources/org/springframework/security/config/http/OAuth2ClientBeanDefinitionParserTests-CustomAuthorizationRedirectStrategy.xml

@@ -33,8 +33,8 @@
 	</http>
 
 	<b:bean id="authorizationRedirectStrategy" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.web.RedirectStrategy"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.web.RedirectStrategy" type="java.lang.Class"/>
+</b:bean>
 
 	<client-registrations>
 		<client-registration registration-id="google"

config/src/test/resources/org/springframework/security/config/http/OAuth2ClientBeanDefinitionParserTests-CustomAuthorizedClientService.xml

@@ -45,17 +45,17 @@
 	</client-registrations>
 
 	<b:bean id="authorizedClientService" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.oauth2.client.OAuth2AuthorizedClientService"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.OAuth2AuthorizedClientService" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="authorizationRequestRepository" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.oauth2.client.web.AuthorizationRequestRepository"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.web.AuthorizationRequestRepository" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="authorizationRequestResolver" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.oauth2.client.web.OAuth2AuthorizationRequestResolver"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.web.OAuth2AuthorizationRequestResolver" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="accessTokenResponseClient" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient" type="java.lang.Class"/>
+</b:bean>
 
 	<b:import resource="userservice.xml"/>
 </b:beans>

config/src/test/resources/org/springframework/security/config/http/OAuth2ClientBeanDefinitionParserTests-CustomClientRegistrationRepository.xml

@@ -30,8 +30,8 @@
 	</http>
 
 	<b:bean id="clientRegistrationRepository" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.oauth2.client.registration.ClientRegistrationRepository"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.registration.ClientRegistrationRepository" type="java.lang.Class"/>
+</b:bean>
 
 	<b:import resource="userservice.xml"/>
 </b:beans>

config/src/test/resources/org/springframework/security/config/http/OAuth2ClientBeanDefinitionParserTests-CustomConfiguration.xml

@@ -45,17 +45,17 @@
 	</client-registrations>
 
 	<b:bean id="authorizedClientRepository" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="authorizationRequestRepository" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.oauth2.client.web.AuthorizationRequestRepository"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.web.AuthorizationRequestRepository" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="authorizationRequestResolver" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.oauth2.client.web.OAuth2AuthorizationRequestResolver"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.web.OAuth2AuthorizationRequestResolver" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="accessTokenResponseClient" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient" type="java.lang.Class"/>
+</b:bean>
 
 	<b:import resource="userservice.xml"/>
 </b:beans>

config/src/test/resources/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParserTests-AuthorizedClientArgumentResolver.xml

@@ -35,8 +35,8 @@
 	<mvc:annotation-driven />
 
 	<b:bean id="authorizedClientRepository" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository" type="java.lang.Class"/>
+</b:bean>
 
 	<b:bean name="authorizedClientController" class="org.springframework.security.config.http.OAuth2LoginBeanDefinitionParserTests.AuthorizedClientController" />
 

config/src/test/resources/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParserTests-MultiClientRegistration-WithCustomConfiguration.xml

@@ -33,20 +33,20 @@
 	</http>
 
 	<b:bean id="accessTokenResponseClient" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="oauth2UserService" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.userinfo.OAuth2UserService"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.userinfo.OAuth2UserService" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="authenticationSuccessListener" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.context.ApplicationListener"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.context.ApplicationListener" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="authorizationRequestRepository" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.web.AuthorizationRequestRepository"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.web.AuthorizationRequestRepository" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="authenticationSuccessHandler" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.web.authentication.AuthenticationSuccessHandler"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.web.authentication.AuthenticationSuccessHandler" type="java.lang.Class"/>
+</b:bean>
 
 	<b:import resource="../oauth2/client/google-github-registration.xml"/>
 	<b:import resource="userservice.xml"/>

config/src/test/resources/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParserTests-MultiClientRegistration-WithCustomGrantedAuthorities.xml

@@ -35,23 +35,23 @@
 	</http>
 
 	<b:bean id="accessTokenResponseClient" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="oauth2UserService" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.userinfo.OAuth2UserService"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.userinfo.OAuth2UserService" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="userAuthoritiesMapper" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.core.authority.mapping.GrantedAuthoritiesMapper"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.core.authority.mapping.GrantedAuthoritiesMapper" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="authorizationRequestRepository" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.web.AuthorizationRequestRepository"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.web.AuthorizationRequestRepository" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="authenticationSuccessHandler" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.web.authentication.AuthenticationSuccessHandler"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.web.authentication.AuthenticationSuccessHandler" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="jwtDecoderFactory" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.jwt.JwtDecoderFactory"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.jwt.JwtDecoderFactory" type="java.lang.Class"/>
+</b:bean>
 
 	<b:import resource="../oauth2/client/google-github-registration.xml"/>
 	<b:import resource="userservice.xml"/>

config/src/test/resources/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParserTests-MultiClientRegistration-WithCustomLoginProcessingUrl.xml

@@ -34,17 +34,17 @@
 	</http>
 
 	<b:bean id="accessTokenResponseClient" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="oauth2UserService" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.userinfo.OAuth2UserService"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.userinfo.OAuth2UserService" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="authorizationRequestRepository" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.web.AuthorizationRequestRepository"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.web.AuthorizationRequestRepository" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="authenticationSuccessHandler" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.web.authentication.AuthenticationSuccessHandler"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.web.authentication.AuthenticationSuccessHandler" type="java.lang.Class"/>
+</b:bean>
 
 	<b:import resource="../oauth2/client/google-github-registration.xml"/>
 	<b:import resource="userservice.xml"/>

config/src/test/resources/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParserTests-SingleClientRegistration-WithCustomAuthenticationFailureHandler.xml

@@ -30,8 +30,8 @@
 	</http>
 
 	<b:bean id="authenticationFailureHandler" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.web.authentication.AuthenticationFailureHandler"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.web.authentication.AuthenticationFailureHandler" type="java.lang.Class"/>
+</b:bean>
 
 	<b:import resource="../oauth2/client/google-registration.xml"/>
 	<b:import resource="userservice.xml"/>

config/src/test/resources/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParserTests-SingleClientRegistration-WithCustomAuthorizationRedirectStrategy.xml

@@ -30,8 +30,8 @@
 	</http>
 
 	<b:bean id="authorizationRedirectStrategy" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.web.RedirectStrategy"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.web.RedirectStrategy" type="java.lang.Class"/>
+</b:bean>
 
 	<b:import resource="../oauth2/client/google-registration.xml"/>
 	<b:import resource="userservice.xml"/>

config/src/test/resources/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParserTests-SingleClientRegistration-WithCustomAuthorizationRequestResolver.xml

@@ -30,8 +30,8 @@
 	</http>
 
 	<b:bean id="authorizationRequestResolver" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.web.OAuth2AuthorizationRequestResolver"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.web.OAuth2AuthorizationRequestResolver" type="java.lang.Class"/>
+</b:bean>
 
 	<b:import resource="../oauth2/client/google-registration.xml"/>
 	<b:import resource="userservice.xml"/>

config/src/test/resources/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParserTests-SingleClientRegistration-WithJwtDecoderFactory.xml

@@ -34,20 +34,20 @@
 	</http>
 
 	<b:bean id="accessTokenResponseClient" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="jwtDecoderFactory" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.jwt.JwtDecoderFactory"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.jwt.JwtDecoderFactory" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="userAuthoritiesMapper" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.core.authority.mapping.GrantedAuthoritiesMapper"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.core.authority.mapping.GrantedAuthoritiesMapper" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="authorizationRequestRepository" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.web.AuthorizationRequestRepository"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.web.AuthorizationRequestRepository" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="authenticationSuccessHandler" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.web.authentication.AuthenticationSuccessHandler"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.web.authentication.AuthenticationSuccessHandler" type="java.lang.Class"/>
+</b:bean>
 
 	<b:import resource="../oauth2/client/google-registration.xml"/>
 	<b:import resource="userservice.xml"/>

config/src/test/resources/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParserTests-SingleClientRegistration-WithJwtDecoderFactoryAndDefaultSuccessHandler.xml

@@ -33,17 +33,17 @@
 	</http>
 
 	<b:bean id="accessTokenResponseClient" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="jwtDecoderFactory" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.jwt.JwtDecoderFactory"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.jwt.JwtDecoderFactory" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="authorizationRequestRepository" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.web.AuthorizationRequestRepository"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.web.AuthorizationRequestRepository" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="requestCache" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.web.savedrequest.RequestCache"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.web.savedrequest.RequestCache" type="java.lang.Class"/>
+</b:bean>
 
 	<b:import resource="../oauth2/client/google-registration.xml"/>
 	<b:import resource="userservice.xml"/>

config/src/test/resources/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParserTests-SingleClientRegistration.xml

@@ -50,8 +50,8 @@
 	</client-registrations>
 
 	<b:bean id="requestCache" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.web.savedrequest.RequestCache"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.web.savedrequest.RequestCache" type="java.lang.Class"/>
+</b:bean>
 
 	<b:import resource="userservice.xml"/>
 </b:beans>

config/src/test/resources/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParserTests-WithCustomAuthorizedClientRepository.xml

@@ -34,20 +34,20 @@
 	</http>
 
 	<b:bean id="accessTokenResponseClient" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="oauth2UserService" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.userinfo.OAuth2UserService"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.userinfo.OAuth2UserService" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="authorizationRequestRepository" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.web.AuthorizationRequestRepository"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.web.AuthorizationRequestRepository" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="clientRegistrationRepository" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.registration.ClientRegistrationRepository"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.registration.ClientRegistrationRepository" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="authorizedClientRepository" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository" type="java.lang.Class"/>
+</b:bean>
 
 	<b:import resource="userservice.xml"/>
 </b:beans>

config/src/test/resources/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParserTests-WithCustomAuthorizedClientService.xml

@@ -34,20 +34,20 @@
 	</http>
 
 	<b:bean id="accessTokenResponseClient" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="oauth2UserService" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.userinfo.OAuth2UserService"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.userinfo.OAuth2UserService" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="authorizationRequestRepository" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.web.AuthorizationRequestRepository"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.web.AuthorizationRequestRepository" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="clientRegistrationRepository" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.registration.ClientRegistrationRepository"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.registration.ClientRegistrationRepository" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="authorizedClientService" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.OAuth2AuthorizedClientService"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.OAuth2AuthorizedClientService" type="java.lang.Class"/>
+</b:bean>
 
 	<b:import resource="userservice.xml"/>
 </b:beans>

config/src/test/resources/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParserTests-WithCustomClientRegistrationRepository.xml

@@ -33,17 +33,17 @@
 	</http>
 
 	<b:bean id="accessTokenResponseClient" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="oauth2UserService" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.userinfo.OAuth2UserService"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.userinfo.OAuth2UserService" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="authorizationRequestRepository" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.web.AuthorizationRequestRepository"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.web.AuthorizationRequestRepository" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="clientRegistrationRepository" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.registration.ClientRegistrationRepository"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.registration.ClientRegistrationRepository" type="java.lang.Class"/>
+</b:bean>
 
 	<b:import resource="userservice.xml"/>
 </b:beans>

config/src/test/resources/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParserTests-WithCustomSecurityContextHolderStrategy.xml

@@ -40,20 +40,20 @@
 	</b:bean>
 
 	<b:bean id="accessTokenResponseClient" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="oauth2UserService" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.userinfo.OAuth2UserService"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.userinfo.OAuth2UserService" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="authorizationRequestRepository" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.web.AuthorizationRequestRepository"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.web.AuthorizationRequestRepository" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="clientRegistrationRepository" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.registration.ClientRegistrationRepository"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.registration.ClientRegistrationRepository" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="authorizedClientService" class="org.mockito.Mockito" factory-method="mock">
-			<b:constructor-arg value="org.springframework.security.oauth2.client.OAuth2AuthorizedClientService"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.oauth2.client.OAuth2AuthorizedClientService" type="java.lang.Class"/>
+</b:bean>
 
 	<b:import resource="userservice.xml"/>
 </b:beans>

config/src/test/resources/org/springframework/security/config/http/Saml2LoginBeanDefinitionParserTests-SingleRelyingPartyRegistration-WithCustomAuthenticationFailureHandler.xml

@@ -28,10 +28,10 @@
 		<intercept-url pattern="/**" access="authenticated"/>
 		<saml2-login authentication-failure-handler-ref="authenticationFailureHandler"/>
 	</http>
-	
+
 	<b:bean id="authenticationFailureHandler" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.web.authentication.AuthenticationFailureHandler"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.web.authentication.AuthenticationFailureHandler" type="java.lang.Class"/>
+</b:bean>
 
 	<b:import resource="userservice.xml"/>
 	<b:import resource="../saml2/google-registration.xml"/>

config/src/test/resources/org/springframework/security/config/http/Saml2LoginBeanDefinitionParserTests-SingleRelyingPartyRegistration.xml

@@ -36,7 +36,7 @@
 																assertion-consumer-service-location="{baseUrl}/login/saml2/sso/{registrationId}"
 																assertion-consumer-service-binding="REDIRECT"
 																asserting-party-id="google"/>
-		
+
 		<asserting-party asserting-party-id="google" entity-id="https://accounts.google.com/o/saml2/idp/entity-id"
 										 want-authn-requests-signed="true"
 										 single-sign-on-service-location="https://accounts.google.com/o/saml2/idp/sso-url"
@@ -51,8 +51,8 @@
 	</relying-party-registrations>
 
 	<b:bean id="requestCache" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.web.savedrequest.RequestCache"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.web.savedrequest.RequestCache" type="java.lang.Class"/>
+</b:bean>
 
 	<b:import resource="userservice.xml"/>
 </b:beans>

config/src/test/resources/org/springframework/security/config/http/Saml2LoginBeanDefinitionParserTests-WithCustomLoginProcessingUrl-WithCustomAuthenticationConverter.xml

@@ -28,11 +28,11 @@
 		<intercept-url pattern="/**" access="authenticated"/>
 		<saml2-login login-processing-url="/my/custom/url" authentication-converter-ref="authenticationConverter"/>
 	</http>
-	
+
 	<b:bean id="authenticationConverter" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.web.authentication.AuthenticationConverter"/>
-	</b:bean>
-	
+    <b:constructor-arg value="org.springframework.security.web.authentication.AuthenticationConverter" type="java.lang.Class"/>
+</b:bean>
+
 	<b:import resource="../saml2/google-registration.xml"/>
 	<b:import resource="userservice.xml"/>
 </b:beans>

config/src/test/resources/org/springframework/security/config/http/Saml2LoginBeanDefinitionParserTests-WithCustomRelyingPartyRepository-WithCustomAuthenticationConverter.xml

@@ -28,13 +28,13 @@
 		<intercept-url pattern="/**" access="authenticated"/>
 		<saml2-login relying-party-registration-repository-ref="relyingPartyRegistrationRepository" authentication-converter-ref="authenticationConverter"/>
 	</http>
-	
+
 	<b:bean id="relyingPartyRegistrationRepository" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="authenticationConverter" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.web.authentication.AuthenticationConverter"/>
-	</b:bean>
-	
+    <b:constructor-arg value="org.springframework.security.web.authentication.AuthenticationConverter" type="java.lang.Class"/>
+</b:bean>
+
 	<b:import resource="userservice.xml"/>
 </b:beans>

config/src/test/resources/org/springframework/security/config/http/Saml2LoginBeanDefinitionParserTests-WithCustomRelyingPartyRepository-WithCustomAuthenticationManager.xml

@@ -28,13 +28,13 @@
 		<intercept-url pattern="/**" access="authenticated"/>
 		<saml2-login relying-party-registration-repository-ref="relyingPartyRegistrationRepository" authentication-manager-ref="customAuthenticationManager"/>
 	</http>
-	
+
 	<b:bean id="relyingPartyRegistrationRepository" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="customAuthenticationManager" name="customAuthenticationManager" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.authentication.AuthenticationManager"/>
-	</b:bean>
-	
+    <b:constructor-arg value="org.springframework.security.authentication.AuthenticationManager" type="java.lang.Class"/>
+</b:bean>
+
 	<b:import resource="userservice.xml"/>
 </b:beans>

config/src/test/resources/org/springframework/security/config/http/Saml2LoginBeanDefinitionParserTests-WithCustomRelyingPartyRepository-WithCustomAuthenticationRequestResolver.xml

@@ -29,13 +29,13 @@
 		<saml2-login relying-party-registration-repository-ref="relyingPartyRegistrationRepository"
 								 authentication-request-resolver-ref="authenticationRequestResolver"/>
 	</http>
-	
+
 	<b:bean id="relyingPartyRegistrationRepository" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="authenticationRequestResolver" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.saml2.provider.service.web.authentication.Saml2AuthenticationRequestResolver"/>
-	</b:bean>
-	
+    <b:constructor-arg value="org.springframework.security.saml2.provider.service.web.authentication.Saml2AuthenticationRequestResolver" type="java.lang.Class"/>
+</b:bean>
+
 	<b:import resource="userservice.xml"/>
 </b:beans>

config/src/test/resources/org/springframework/security/config/http/Saml2LoginBeanDefinitionParserTests-WithCustomRelyingPartyRepository-WithCustomAuthnRequestRepository.xml

@@ -28,13 +28,13 @@
 		<intercept-url pattern="/**" access="authenticated"/>
 		<saml2-login relying-party-registration-repository-ref="relyingPartyRegistrationRepository" authentication-request-repository-ref="authenticationRequestRepository"/>
 	</http>
-	
+
 	<b:bean id="relyingPartyRegistrationRepository" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="authenticationRequestRepository" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.saml2.provider.service.web.Saml2AuthenticationRequestRepository"/>
-	</b:bean>
-	
+    <b:constructor-arg value="org.springframework.security.saml2.provider.service.web.Saml2AuthenticationRequestRepository" type="java.lang.Class"/>
+</b:bean>
+
 	<b:import resource="userservice.xml"/>
 </b:beans>

config/src/test/resources/org/springframework/security/config/http/Saml2LoginBeanDefinitionParserTests-WithCustomRelyingPartyRepository.xml

@@ -28,16 +28,16 @@
 		<intercept-url pattern="/**" access="authenticated"/>
 		<saml2-login authentication-success-handler-ref="authenticationSuccessHandler" relying-party-registration-repository-ref="relyingPartyRegistrationRepository"/>
 	</http>
-	
+
 	<b:bean id="authenticationSuccessListener" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.context.ApplicationListener"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.context.ApplicationListener" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="authenticationSuccessHandler" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.web.authentication.AuthenticationSuccessHandler"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.web.authentication.AuthenticationSuccessHandler" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="relyingPartyRegistrationRepository" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository"/>
-	</b:bean>
-	
+    <b:constructor-arg value="org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository" type="java.lang.Class"/>
+</b:bean>
+
 	<b:import resource="userservice.xml"/>
 </b:beans>

config/src/test/resources/org/springframework/security/config/http/Saml2LoginBeanDefinitionParserTests-WithCustomSecurityContextHolderStrategy.xml

@@ -36,14 +36,14 @@
 	</b:bean>
 
 	<b:bean id="authenticationSuccessListener" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.context.ApplicationListener"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.context.ApplicationListener" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="authenticationSuccessHandler" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.web.authentication.AuthenticationSuccessHandler"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.web.authentication.AuthenticationSuccessHandler" type="java.lang.Class"/>
+</b:bean>
 	<b:bean id="relyingPartyRegistrationRepository" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository" type="java.lang.Class"/>
+</b:bean>
 
 	<b:import resource="userservice.xml"/>
 </b:beans>

config/src/test/resources/org/springframework/security/config/http/Saml2LogoutBeanDefinitionParserTests-CsrfDisabled-MockLogoutSuccessHandler.xml

@@ -31,11 +31,11 @@
 		<saml2-login/>
 		<saml2-logout/>
 	</http>
-	
+
 	<b:bean id="logoutSuccessHandler" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.web.authentication.logout.LogoutSuccessHandler"/>
-	</b:bean>
-	
+    <b:constructor-arg value="org.springframework.security.web.authentication.logout.LogoutSuccessHandler" type="java.lang.Class"/>
+</b:bean>
+
 	<b:import resource="userservice.xml"/>
 	<b:import resource="../saml2/logout-registrations.xml"/>
 </b:beans>

config/src/test/resources/org/springframework/security/config/http/Saml2LogoutBeanDefinitionParserTests-CustomComponents.xml

@@ -30,27 +30,27 @@
 		<saml2-logout logout-request-resolver-ref="logoutRequestResolver" logout-request-repository-ref="logoutRequestRepository"
 				logout-request-validator-ref="logoutRequestValidator" logout-response-validator-ref="logoutResponseValidator" logout-response-resolver-ref="logoutResponseResolver"/>
 	</http>
-	
+
 	<b:bean id="logoutRequestResolver" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.saml2.provider.service.web.authentication.logout.Saml2LogoutRequestResolver"/>
-	</b:bean>
-	
+    <b:constructor-arg value="org.springframework.security.saml2.provider.service.web.authentication.logout.Saml2LogoutRequestResolver" type="java.lang.Class"/>
+</b:bean>
+
 	<b:bean id="logoutRequestRepository" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.saml2.provider.service.web.authentication.logout.Saml2LogoutRequestRepository"/>
-	</b:bean>
-	
+    <b:constructor-arg value="org.springframework.security.saml2.provider.service.web.authentication.logout.Saml2LogoutRequestRepository" type="java.lang.Class"/>
+</b:bean>
+
 	<b:bean id="logoutRequestValidator" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.saml2.provider.service.authentication.logout.Saml2LogoutRequestValidator"/>
-	</b:bean>
-	
+    <b:constructor-arg value="org.springframework.security.saml2.provider.service.authentication.logout.Saml2LogoutRequestValidator" type="java.lang.Class"/>
+</b:bean>
+
 	<b:bean id="logoutResponseValidator" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.saml2.provider.service.authentication.logout.Saml2LogoutResponseValidator"/>
-	</b:bean>
-	
+    <b:constructor-arg value="org.springframework.security.saml2.provider.service.authentication.logout.Saml2LogoutResponseValidator" type="java.lang.Class"/>
+</b:bean>
+
 	<b:bean id="logoutResponseResolver" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.saml2.provider.service.web.authentication.logout.Saml2LogoutResponseResolver"/>
-	</b:bean>
-	
+    <b:constructor-arg value="org.springframework.security.saml2.provider.service.web.authentication.logout.Saml2LogoutResponseResolver" type="java.lang.Class"/>
+</b:bean>
+
 	<b:import resource="userservice.xml"/>
 	<b:import resource="../saml2/logout-registrations.xml"/>
 </b:beans>

config/src/test/resources/org/springframework/security/config/method-security.xml

@@ -64,6 +64,6 @@
 	</authentication-manager>
 
 	<b:bean id="authorization-manager" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.authorization.AuthorizationManager"/>
-	</b:bean>
+    <b:constructor-arg value="org.springframework.security.authorization.AuthorizationManager" type="java.lang.Class"/>
+</b:bean>
 </b:beans>

web/src/test/resources/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTest-context.xml

@@ -11,15 +11,15 @@
 		</constructor-arg>
 		<property name="defaultEntryPoint" ref="defaultAEP"/>
 	</bean>
-	
+
 	<bean id="firstAEP" class="org.mockito.Mockito" factory-method="mock">
-		<constructor-arg value="org.springframework.security.web.AuthenticationEntryPoint"/>
+		<constructor-arg value="org.springframework.security.web.AuthenticationEntryPoint" type="java.lang.Class"/>
 	</bean>
-	
-		
+
+
 	<bean id="defaultAEP" class="org.mockito.Mockito" factory-method="mock">
-		<constructor-arg value="org.springframework.security.web.AuthenticationEntryPoint"/>
+		<constructor-arg value="org.springframework.security.web.AuthenticationEntryPoint" type="java.lang.Class"/>
 	</bean>
 
-	
+
 </beans>