From eb570ec4477f0e61e1516104db9335b8749ac18f Mon Sep 17 00:00:00 2001
From: abilan <abilan@vmware.com>
Date: Tue, 20 Dec 2022 21:14:02 -0500
Subject: [PATCH] More test XML configs for latest Mockito

---
 .../WebFluxInboundChannelAdapterParserTests-context.xml  | 9 +++++----
 .../config/WebFluxInboundGatewayParserTests-context.xml  | 7 ++++---
 .../websocket/config/WebSocketParserTests-context.xml    | 8 ++++----
 .../integration/ws/config/UriVariableTests-context.xml   | 4 ++--
 .../WebServiceInboundGatewayParserTests-context.xml      | 2 +-
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxInboundChannelAdapterParserTests-context.xml b/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxInboundChannelAdapterParserTests-context.xml
index 1f6012280d..8b8bdffd28 100644
--- a/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxInboundChannelAdapterParserTests-context.xml
+++ b/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxInboundChannelAdapterParserTests-context.xml
@@ -11,7 +11,7 @@
 	<si:channel id="requests"/>
 
 	<beans:bean id="validator" class="org.mockito.Mockito" factory-method="mock">
-		<beans:constructor-arg value="org.springframework.validation.Validator"/>
+		<beans:constructor-arg value="org.springframework.validation.Validator" type="java.lang.Class"/>
 	</beans:bean>
 
 	<inbound-channel-adapter id="reactiveMinimalConfig" channel="requests" validator="validator"/>
@@ -36,15 +36,16 @@
 	</inbound-channel-adapter>
 
 	<beans:bean id="headerMapper" class="org.mockito.Mockito" factory-method="mock">
-		<beans:constructor-arg value="org.springframework.integration.mapping.HeaderMapper"/>
+		<beans:constructor-arg value="org.springframework.integration.mapping.HeaderMapper" type="java.lang.Class"/>
 	</beans:bean>
 
 	<beans:bean id="codecConfigurer" class="org.mockito.Mockito" factory-method="mock">
-		<beans:constructor-arg value="org.springframework.http.codec.ServerCodecConfigurer"/>
+		<beans:constructor-arg value="org.springframework.http.codec.ServerCodecConfigurer" type="java.lang.Class"/>
 	</beans:bean>
 
 	<beans:bean id="requestedContentTypeResolver" class="org.mockito.Mockito" factory-method="mock">
-		<beans:constructor-arg value="org.springframework.web.reactive.accept.RequestedContentTypeResolver"/>
+		<beans:constructor-arg value="org.springframework.web.reactive.accept.RequestedContentTypeResolver"
+							   type="java.lang.Class"/>
 	</beans:bean>
 
 	<beans:bean id="reactiveAdapterRegistry" class="org.springframework.core.ReactiveAdapterRegistry"/>
diff --git a/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxInboundGatewayParserTests-context.xml b/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxInboundGatewayParserTests-context.xml
index 10950f6f3d..0ff2c295a6 100644
--- a/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxInboundGatewayParserTests-context.xml
+++ b/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxInboundGatewayParserTests-context.xml
@@ -32,15 +32,16 @@
 	</inbound-gateway>
 
 	<beans:bean id="headerMapper" class="org.mockito.Mockito" factory-method="mock">
-		<beans:constructor-arg value="org.springframework.integration.mapping.HeaderMapper"/>
+		<beans:constructor-arg value="org.springframework.integration.mapping.HeaderMapper" type="java.lang.Class"/>
 	</beans:bean>
 
 	<beans:bean id="codecConfigurer" class="org.mockito.Mockito" factory-method="mock">
-		<beans:constructor-arg value="org.springframework.http.codec.ServerCodecConfigurer"/>
+		<beans:constructor-arg value="org.springframework.http.codec.ServerCodecConfigurer" type="java.lang.Class"/>
 	</beans:bean>
 
 	<beans:bean id="requestedContentTypeResolver" class="org.mockito.Mockito" factory-method="mock">
-		<beans:constructor-arg value="org.springframework.web.reactive.accept.RequestedContentTypeResolver"/>
+		<beans:constructor-arg value="org.springframework.web.reactive.accept.RequestedContentTypeResolver"
+							   type="java.lang.Class"/>
 	</beans:bean>
 
 	<beans:bean id="reactiveAdapterRegistry" class="org.springframework.core.ReactiveAdapterRegistry"/>
diff --git a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/config/WebSocketParserTests-context.xml b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/config/WebSocketParserTests-context.xml
index cb247ac12f..bbe0660f1f 100644
--- a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/config/WebSocketParserTests-context.xml
+++ b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/config/WebSocketParserTests-context.xml
@@ -34,15 +34,15 @@
 	</int-websocket:server-container>
 
 	<bean id="handshakeHandler" class="org.mockito.Mockito" factory-method="mock">
-		<constructor-arg value="org.springframework.web.socket.server.HandshakeHandler"  type="java.lang.Class"/>
+		<constructor-arg value="org.springframework.web.socket.server.HandshakeHandler" type="java.lang.Class"/>
 	</bean>
 
 	<bean id="handshakeInterceptor" class="org.mockito.Mockito" factory-method="mock">
-		<constructor-arg value="org.springframework.web.socket.server.HandshakeInterceptor"  type="java.lang.Class"/>
+		<constructor-arg value="org.springframework.web.socket.server.HandshakeInterceptor" type="java.lang.Class"/>
 	</bean>
 
 	<bean id="sockJsMessageCodec" class="org.mockito.Mockito" factory-method="mock">
-		<constructor-arg value="org.springframework.web.socket.sockjs.frame.SockJsMessageCodec"  type="java.lang.Class"/>
+		<constructor-arg value="org.springframework.web.socket.sockjs.frame.SockJsMessageCodec" type="java.lang.Class"/>
 	</bean>
 
 	<bean id="decoratorFactory"
@@ -57,7 +57,7 @@
 										   use-broker="true" />
 
 	<bean id="webSocketClient" class="org.mockito.Mockito" factory-method="mock">
-		<constructor-arg value="org.springframework.web.socket.client.WebSocketClient"  type="java.lang.Class"/>
+		<constructor-arg value="org.springframework.web.socket.client.WebSocketClient" type="java.lang.Class"/>
 	</bean>
 
 	<int-websocket:client-container id="clientWebSocketContainer"
diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests-context.xml b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests-context.xml
index c00b5d80ed..c6d41188c1 100644
--- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests-context.xml
+++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests-context.xml
@@ -36,7 +36,7 @@
 	</bean>
 
 	<bean id="jmsConnectionFactory" class="org.mockito.Mockito" factory-method="mock">
-		<constructor-arg value="jakarta.jms.ConnectionFactory"/>
+		<constructor-arg value="jakarta.jms.ConnectionFactory" type="java.lang.Class"/>
 	</bean>
 
 	<!--Email Transport-->
@@ -70,7 +70,7 @@
 	</bean>
 
 	<bean id="xmppConnection" class="org.mockito.Mockito" factory-method="mock">
-		<constructor-arg value="org.jivesoftware.smack.XMPPConnection"/>
+		<constructor-arg value="org.jivesoftware.smack.XMPPConnection" type="java.lang.Class"/>
 	</bean>
 
 </beans>
diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests-context.xml b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests-context.xml
index d9521ef51d..f2c0e133f3 100644
--- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests-context.xml
+++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests-context.xml
@@ -45,7 +45,7 @@
 			header-mapper="testHeaderMapper"/>
 
 	<bean id="marshaller" class="org.mockito.Mockito" factory-method="mock">
-		<constructor-arg value="org.springframework.oxm.support.AbstractMarshaller" />
+		<constructor-arg value="org.springframework.oxm.support.AbstractMarshaller" type="java.lang.Class"/>
 	</bean>
 
 	<bean id="testHeaderMapper" class="org.springframework.integration.ws.config.WebServiceInboundGatewayParserTests$TestHeaderMapper"/>