From 87ae2d41b3afb352000c61b7a187aa9d1be8b6ea Mon Sep 17 00:00:00 2001
From: Josh Cummings <josh.cummings@gmail.com>
Date: Wed, 16 Aug 2023 16:28:52 -0600
Subject: [PATCH] Update Mockito Usage

Issue gh-13542
---
 .../config/http/HttpConfigTests-WithObservationRegistry.xml  | 2 +-
 .../config/http/MiscHttpConfigTests-CollidingFilters.xml     | 2 +-
 ...cHttpConfigTests-CustomAuthenticationDetailsSourceRef.xml | 2 +-
 .../config/http/MiscHttpConfigTests-CustomFilters.xml        | 2 +-
 .../MiscHttpConfigTests-CustomHttpBasicEntryPointRef.xml     | 2 +-
 .../security/config/http/MiscHttpConfigTests-EntryPoint.xml  | 2 +-
 ...MiscHttpConfigTests-ExplicitSaveAndExplicitRepository.xml | 2 +-
 .../config/http/MiscHttpConfigTests-ExpressionHandler.xml    | 2 +-
 .../config/http/MiscHttpConfigTests-HttpFirewall.xml         | 2 +-
 .../security/config/http/MiscHttpConfigTests-Jaas.xml        | 2 +-
 .../config/http/MiscHttpConfigTests-RequestCache.xml         | 2 +-
 .../security/config/http/MiscHttpConfigTests-Sec750.xml      | 2 +-
 .../http/MiscHttpConfigTests-SecurityContextRepository.xml   | 2 +-
 ...anDefinitionParserTests-AuthenticationManagerResolver.xml | 2 +-
 ...serTests-AuthenticationManagerResolverPlusOtherConfig.xml | 4 ++--
 ...ceServerBeanDefinitionParserTests-ExpiredJwtClockSkew.xml | 2 +-
 ...erverBeanDefinitionParserTests-JwtDecoderAndJwkSetUri.xml | 2 +-
 ...urceServerBeanDefinitionParserTests-JwtRestOperations.xml | 2 +-
 ...rverBeanDefinitionParserTests-MockBearerTokenResolver.xml | 2 +-
 ...nDefinitionParserTests-MockJwtAuthenticationConverter.xml | 2 +-
 ...esourceServerBeanDefinitionParserTests-MockJwtDecoder.xml | 2 +-
 ...ourceServerBeanDefinitionParserTests-MockJwtValidator.xml | 4 ++--
 ...BeanDefinitionParserTests-MockOpaqueTokenIntrospector.xml | 2 +-
 ...tionParserTests-OpaqueTokenAndAuthenticationConverter.xml | 5 ++---
 ...nDefinitionParserTests-OpaqueTokenAndIntrospectionUri.xml | 2 +-
 ...erBeanDefinitionParserTests-OpaqueTokenRestOperations.xml | 2 +-
 ...ServerBeanDefinitionParserTests-UnexpiredJwtClockSkew.xml | 2 +-
 .../http/RememberMeConfigTests-WithUserDetailsService.xml    | 4 ++--
 ...ageBrokerConfigTests-CustomAuthorizationManagerConfig.xml | 2 +-
 29 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/config/src/test/resources/org/springframework/security/config/http/HttpConfigTests-WithObservationRegistry.xml b/config/src/test/resources/org/springframework/security/config/http/HttpConfigTests-WithObservationRegistry.xml
index d1d1839f9b..0e3320619f 100644
--- a/config/src/test/resources/org/springframework/security/config/http/HttpConfigTests-WithObservationRegistry.xml
+++ b/config/src/test/resources/org/springframework/security/config/http/HttpConfigTests-WithObservationRegistry.xml
@@ -29,7 +29,7 @@
 	</http>
 
 	<b:bean name="handler" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="io.micrometer.observation.ObservationHandler"/>
+		<b:constructor-arg value="io.micrometer.observation.ObservationHandler" type="java.lang.Class"/>
 	</b:bean>
 
 	<b:bean name="ref" class="org.springframework.security.config.http.HttpConfigTests.MockObservationRegistry">
diff --git a/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-CollidingFilters.xml b/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-CollidingFilters.xml
index e6a66cd5bf..c46c8d47cf 100644
--- a/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-CollidingFilters.xml
+++ b/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-CollidingFilters.xml
@@ -29,7 +29,7 @@
 	</http>
 
 	<b:bean name="userFilter" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="jakarta.servlet.Filter"/>
+		<b:constructor-arg value="jakarta.servlet.Filter" type="java.lang.Class"/>
 	</b:bean>
 
 	<b:import resource="userservice.xml"/>
diff --git a/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-CustomAuthenticationDetailsSourceRef.xml b/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-CustomAuthenticationDetailsSourceRef.xml
index 2dfdfde842..97fa2662c5 100644
--- a/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-CustomAuthenticationDetailsSourceRef.xml
+++ b/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-CustomAuthenticationDetailsSourceRef.xml
@@ -32,7 +32,7 @@
 	</http>
 
 	<b:bean name="authenticationDetailsSource" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.authentication.AuthenticationDetailsSource"/>
+		<b:constructor-arg value="org.springframework.security.authentication.AuthenticationDetailsSource" type="java.lang.Class"/>
 	</b:bean>
 
 	<b:import resource="MiscHttpConfigTests-controllers.xml"/>
diff --git a/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-CustomFilters.xml b/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-CustomFilters.xml
index ec486f8422..f547d25487 100644
--- a/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-CustomFilters.xml
+++ b/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-CustomFilters.xml
@@ -34,7 +34,7 @@
 	<b:bean name="propertyPlaceholderConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
 	<b:bean name="userFilter" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="jakarta.servlet.Filter"/>
+		<b:constructor-arg value="jakarta.servlet.Filter" type="java.lang.Class"/>
 	</b:bean>
 
 	<b:import resource="userservice.xml"/>
diff --git a/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-CustomHttpBasicEntryPointRef.xml b/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-CustomHttpBasicEntryPointRef.xml
index 47a0a16e01..8168a807e9 100644
--- a/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-CustomHttpBasicEntryPointRef.xml
+++ b/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-CustomHttpBasicEntryPointRef.xml
@@ -30,7 +30,7 @@
 	</http>
 
 	<b:bean name="entryPoint" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.web.AuthenticationEntryPoint"/>
+		<b:constructor-arg value="org.springframework.security.web.AuthenticationEntryPoint" type="java.lang.Class"/>
 	</b:bean>
 
 	<b:import resource="userservice.xml"/>
diff --git a/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-EntryPoint.xml b/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-EntryPoint.xml
index d158b914bf..e9426cac31 100644
--- a/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-EntryPoint.xml
+++ b/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-EntryPoint.xml
@@ -29,7 +29,7 @@
 	</http>
 
 	<b:bean name="entryPoint" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.web.AuthenticationEntryPoint"/>
+		<b:constructor-arg value="org.springframework.security.web.AuthenticationEntryPoint" type="java.lang.Class"/>
 	</b:bean>
 
 	<b:import resource="userservice.xml"/>
diff --git a/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-ExplicitSaveAndExplicitRepository.xml b/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-ExplicitSaveAndExplicitRepository.xml
index 4406065ff6..53513aa671 100644
--- a/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-ExplicitSaveAndExplicitRepository.xml
+++ b/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-ExplicitSaveAndExplicitRepository.xml
@@ -30,7 +30,7 @@
 	</http>
 
 	<b:bean name="repo" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.web.context.SecurityContextRepository"/>
+		<b:constructor-arg value="org.springframework.security.web.context.SecurityContextRepository" type="java.lang.Class"/>
 	</b:bean>
 
 	<b:import resource="MiscHttpConfigTests-controllers.xml"/>
diff --git a/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-ExpressionHandler.xml b/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-ExpressionHandler.xml
index b7a8e6d1c0..7fd5edadb3 100644
--- a/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-ExpressionHandler.xml
+++ b/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-ExpressionHandler.xml
@@ -35,7 +35,7 @@
 	</b:bean>
 
 	<b:bean name="permissionEvaluator" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.access.PermissionEvaluator"/>
+		<b:constructor-arg value="org.springframework.security.access.PermissionEvaluator" type="java.lang.Class"/>
 	</b:bean>
 
 	<b:import resource="userservice.xml"/>
diff --git a/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-HttpFirewall.xml b/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-HttpFirewall.xml
index 6bd7635c71..79b520a0bd 100644
--- a/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-HttpFirewall.xml
+++ b/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-HttpFirewall.xml
@@ -32,7 +32,7 @@
 	</http>
 
 	<b:bean name="firewall" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.web.firewall.HttpFirewall"/>
+		<b:constructor-arg value="org.springframework.security.web.firewall.HttpFirewall" type="java.lang.Class"/>
 	</b:bean>
 
 	<b:import resource="userservice.xml"/>
diff --git a/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-Jaas.xml b/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-Jaas.xml
index 39f3597efc..0cd1a88f06 100644
--- a/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-Jaas.xml
+++ b/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-Jaas.xml
@@ -48,7 +48,7 @@
 	</b:bean>
 
 	<b:bean name="jaasAuthorityGranter" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.authentication.jaas.AuthorityGranter"/>
+		<b:constructor-arg value="org.springframework.security.authentication.jaas.AuthorityGranter" type="java.lang.Class"/>
 	</b:bean>
 
 	<authentication-manager id="authenticationManager">
diff --git a/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-RequestCache.xml b/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-RequestCache.xml
index f7fb16b64e..47ed006b15 100644
--- a/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-RequestCache.xml
+++ b/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-RequestCache.xml
@@ -30,7 +30,7 @@
 	</http>
 
 	<b:bean name="requestCache" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.web.savedrequest.RequestCache"/>
+		<b:constructor-arg value="org.springframework.security.web.savedrequest.RequestCache" type="java.lang.Class"/>
 	</b:bean>
 
 	<b:import resource="userservice.xml"/>
diff --git a/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-Sec750.xml b/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-Sec750.xml
index fd91fffdab..ffd22cd312 100644
--- a/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-Sec750.xml
+++ b/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-Sec750.xml
@@ -38,7 +38,7 @@
 	</b:bean>
 
 	<b:bean name="userService" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.core.userdetails.UserDetailsService"/>
+		<b:constructor-arg value="org.springframework.security.core.userdetails.UserDetailsService" type="java.lang.Class"/>
 	</b:bean>
 
 	<b:bean name="beanNameCollectingPostProcessor" class="org.springframework.security.BeanNameCollectingPostProcessor"/>
diff --git a/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-SecurityContextRepository.xml b/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-SecurityContextRepository.xml
index 859cddafd3..0c38bb5943 100644
--- a/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-SecurityContextRepository.xml
+++ b/config/src/test/resources/org/springframework/security/config/http/MiscHttpConfigTests-SecurityContextRepository.xml
@@ -30,7 +30,7 @@
 	</http>
 
 	<b:bean name="repo" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.web.context.SecurityContextRepository"/>
+		<b:constructor-arg value="org.springframework.security.web.context.SecurityContextRepository" type="java.lang.Class"/>
 	</b:bean>
 
 	<b:import resource="MiscHttpConfigTests-controllers.xml"/>
diff --git a/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-AuthenticationManagerResolver.xml b/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-AuthenticationManagerResolver.xml
index 2facf68726..384ecdca84 100644
--- a/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-AuthenticationManagerResolver.xml
+++ b/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-AuthenticationManagerResolver.xml
@@ -22,7 +22,7 @@
 		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<b:bean name="authenticationManagerResolver" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.authentication.AuthenticationManagerResolver"/>
+		<b:constructor-arg value="org.springframework.security.authentication.AuthenticationManagerResolver" type="java.lang.Class"/>
 	</b:bean>
 
 	<http>
diff --git a/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-AuthenticationManagerResolverPlusOtherConfig.xml b/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-AuthenticationManagerResolverPlusOtherConfig.xml
index dbf45c1bd5..69f70fb41c 100644
--- a/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-AuthenticationManagerResolverPlusOtherConfig.xml
+++ b/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-AuthenticationManagerResolverPlusOtherConfig.xml
@@ -22,10 +22,10 @@
 		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<b:bean name="authenticationManagerResolver" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.authentication.AuthenticationManagerResolver"/>
+		<b:constructor-arg value="org.springframework.security.authentication.AuthenticationManagerResolver" type="java.lang.Class"/>
 	</b:bean>
 	<b:bean name="decoder" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.oauth2.jwt.JwtDecoder"/>
+		<b:constructor-arg value="org.springframework.security.oauth2.jwt.JwtDecoder" type="java.lang.Class"/>
 	</b:bean>
 
 	<http>
diff --git a/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-ExpiredJwtClockSkew.xml b/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-ExpiredJwtClockSkew.xml
index c132c7b98e..a9b1b9c0be 100644
--- a/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-ExpiredJwtClockSkew.xml
+++ b/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-ExpiredJwtClockSkew.xml
@@ -31,7 +31,7 @@
 	</b:bean>
 
 	<b:bean name="rest" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.web.client.RestOperations"/>
+		<b:constructor-arg value="org.springframework.web.client.RestOperations" type="java.lang.Class"/>
 	</b:bean>
 
 	<b:bean name="decoder"
diff --git a/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-JwtDecoderAndJwkSetUri.xml b/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-JwtDecoderAndJwkSetUri.xml
index 41957ba36f..8d3bf2da97 100644
--- a/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-JwtDecoderAndJwkSetUri.xml
+++ b/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-JwtDecoderAndJwkSetUri.xml
@@ -26,7 +26,7 @@
 	<c:component-scan base-package="org.springframework.security.config.http"/>
 	<c:property-placeholder local-override="true"/>
 	<b:bean name="decoder" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.oauth2.jwt.JwtDecoder"/>
+		<b:constructor-arg value="org.springframework.security.oauth2.jwt.JwtDecoder" type="java.lang.Class"/>
 	</b:bean>
 
 	<http>
diff --git a/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-JwtRestOperations.xml b/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-JwtRestOperations.xml
index 934e9809fb..d085cecd23 100644
--- a/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-JwtRestOperations.xml
+++ b/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-JwtRestOperations.xml
@@ -22,7 +22,7 @@
 		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<b:bean name="rest" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.web.client.RestOperations"/>
+		<b:constructor-arg value="org.springframework.web.client.RestOperations" type="java.lang.Class"/>
 	</b:bean>
 
 	<b:bean name="decoder"
diff --git a/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-MockBearerTokenResolver.xml b/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-MockBearerTokenResolver.xml
index 421e5f7b5d..ea8a52a283 100644
--- a/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-MockBearerTokenResolver.xml
+++ b/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-MockBearerTokenResolver.xml
@@ -22,6 +22,6 @@
 		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<b:bean name="bearerTokenResolver" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.oauth2.server.resource.web.BearerTokenResolver"/>
+		<b:constructor-arg value="org.springframework.security.oauth2.server.resource.web.BearerTokenResolver" type="java.lang.Class"/>
 	</b:bean>
 </b:beans>
diff --git a/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-MockJwtAuthenticationConverter.xml b/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-MockJwtAuthenticationConverter.xml
index ab9785e7ea..2e912b3f86 100644
--- a/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-MockJwtAuthenticationConverter.xml
+++ b/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-MockJwtAuthenticationConverter.xml
@@ -22,6 +22,6 @@
 		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<b:bean name="jwtAuthenticationConverter" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.core.convert.converter.Converter"/>
+		<b:constructor-arg value="org.springframework.core.convert.converter.Converter" type="java.lang.Class"/>
 	</b:bean>
 </b:beans>
diff --git a/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-MockJwtDecoder.xml b/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-MockJwtDecoder.xml
index 341e1f1a6a..8cd8587fdc 100644
--- a/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-MockJwtDecoder.xml
+++ b/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-MockJwtDecoder.xml
@@ -22,6 +22,6 @@
 		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<b:bean name="decoder" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.oauth2.jwt.JwtDecoder"/>
+		<b:constructor-arg value="org.springframework.security.oauth2.jwt.JwtDecoder" type="java.lang.Class"/>
 	</b:bean>
 </b:beans>
diff --git a/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-MockJwtValidator.xml b/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-MockJwtValidator.xml
index 764f5aaefe..14eeeac50c 100644
--- a/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-MockJwtValidator.xml
+++ b/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-MockJwtValidator.xml
@@ -22,11 +22,11 @@
 		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<b:bean name="jwtValidator" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.oauth2.core.OAuth2TokenValidator"/>
+		<b:constructor-arg value="org.springframework.security.oauth2.core.OAuth2TokenValidator" type="java.lang.Class"/>
 	</b:bean>
 
 	<b:bean name="rest" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.web.client.RestOperations"/>
+		<b:constructor-arg value="org.springframework.web.client.RestOperations" type="java.lang.Class"/>
 	</b:bean>
 
 	<b:bean name="decoder"
diff --git a/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-MockOpaqueTokenIntrospector.xml b/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-MockOpaqueTokenIntrospector.xml
index 49f1897308..43c555aeb3 100644
--- a/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-MockOpaqueTokenIntrospector.xml
+++ b/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-MockOpaqueTokenIntrospector.xml
@@ -22,6 +22,6 @@
 		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<b:bean name="introspector" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.oauth2.server.resource.introspection.OpaqueTokenIntrospector"/>
+		<b:constructor-arg value="org.springframework.security.oauth2.server.resource.introspection.OpaqueTokenIntrospector" type="java.lang.Class"/>
 	</b:bean>
 </b:beans>
diff --git a/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-OpaqueTokenAndAuthenticationConverter.xml b/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-OpaqueTokenAndAuthenticationConverter.xml
index 34efbd8f1f..b25d16ee9e 100644
--- a/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-OpaqueTokenAndAuthenticationConverter.xml
+++ b/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-OpaqueTokenAndAuthenticationConverter.xml
@@ -21,9 +21,8 @@
 		 xsi:schemaLocation="http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd
 		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
-	<b:bean name="authentication-converter"
-			class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.oauth2.server.resource.introspection.OpaqueTokenAuthenticationConverter"/>
+	<b:bean name="authentication-converter" class="org.mockito.Mockito" factory-method="mock">
+		<b:constructor-arg value="org.springframework.security.oauth2.server.resource.introspection.OpaqueTokenAuthenticationConverter" type="java.lang.Class"/>
 	</b:bean>
 
 	<http>
diff --git a/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-OpaqueTokenAndIntrospectionUri.xml b/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-OpaqueTokenAndIntrospectionUri.xml
index 21b470d7cb..495847a5bc 100644
--- a/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-OpaqueTokenAndIntrospectionUri.xml
+++ b/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-OpaqueTokenAndIntrospectionUri.xml
@@ -22,7 +22,7 @@
 		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<b:bean name="introspector" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.oauth2.server.resource.introspection.OpaqueTokenIntrospector"/>
+		<b:constructor-arg value="org.springframework.security.oauth2.server.resource.introspection.OpaqueTokenIntrospector" type="java.lang.Class"/>
 	</b:bean>
 
 	<http>
diff --git a/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-OpaqueTokenRestOperations.xml b/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-OpaqueTokenRestOperations.xml
index 5b855415f7..3f6f3aa182 100644
--- a/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-OpaqueTokenRestOperations.xml
+++ b/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-OpaqueTokenRestOperations.xml
@@ -22,7 +22,7 @@
 		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<b:bean name="rest" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.web.client.RestOperations"/>
+		<b:constructor-arg value="org.springframework.web.client.RestOperations" type="java.lang.Class"/>
 	</b:bean>
 
 	<b:bean name="introspector"
diff --git a/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-UnexpiredJwtClockSkew.xml b/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-UnexpiredJwtClockSkew.xml
index d4119e7ce7..0691039c0e 100644
--- a/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-UnexpiredJwtClockSkew.xml
+++ b/config/src/test/resources/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests-UnexpiredJwtClockSkew.xml
@@ -31,7 +31,7 @@
 	</b:bean>
 
 	<b:bean name="rest" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.web.client.RestOperations"/>
+		<b:constructor-arg value="org.springframework.web.client.RestOperations" type="java.lang.Class"/>
 	</b:bean>
 
 	<b:bean name="decoder"
diff --git a/config/src/test/resources/org/springframework/security/config/http/RememberMeConfigTests-WithUserDetailsService.xml b/config/src/test/resources/org/springframework/security/config/http/RememberMeConfigTests-WithUserDetailsService.xml
index 7e0cb2e1ea..457f9807ee 100644
--- a/config/src/test/resources/org/springframework/security/config/http/RememberMeConfigTests-WithUserDetailsService.xml
+++ b/config/src/test/resources/org/springframework/security/config/http/RememberMeConfigTests-WithUserDetailsService.xml
@@ -34,12 +34,12 @@
 	</authentication-manager>
 
 	<b:bean name="userDetailsService" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.core.userdetails.UserDetailsService"/>
+		<b:constructor-arg value="org.springframework.security.core.userdetails.UserDetailsService" type="java.lang.Class"/>
 	</b:bean>
 
 	<b:bean
 		name="basicController"
 		class="org.springframework.security.config.http.RememberMeConfigTests.BasicController"/>
-	
+
 	<b:import resource="handlermappingintrospector.xml"/>
 </b:beans>
diff --git a/config/src/test/resources/org/springframework/security/config/websocket/WebSocketMessageBrokerConfigTests-CustomAuthorizationManagerConfig.xml b/config/src/test/resources/org/springframework/security/config/websocket/WebSocketMessageBrokerConfigTests-CustomAuthorizationManagerConfig.xml
index 5827be1b75..0e7453cc6b 100644
--- a/config/src/test/resources/org/springframework/security/config/websocket/WebSocketMessageBrokerConfigTests-CustomAuthorizationManagerConfig.xml
+++ b/config/src/test/resources/org/springframework/security/config/websocket/WebSocketMessageBrokerConfigTests-CustomAuthorizationManagerConfig.xml
@@ -23,7 +23,7 @@
 	<b:import resource="classpath:org/springframework/security/config/websocket/websocket.xml"/>
 
 	<b:bean name="authorizationManager" class="org.mockito.Mockito" factory-method="mock">
-		<b:constructor-arg value="org.springframework.security.authorization.AuthorizationManager"/>
+		<b:constructor-arg value="org.springframework.security.authorization.AuthorizationManager" type="java.lang.Class"/>
 	</b:bean>
 
 	<websocket-message-broker authorization-manager-ref="authorizationManager"/>