Fix compilation warnings

This commit is contained in:
Stéphane Nicoll
2025-04-19 11:41:13 +02:00
parent eac9955ad3
commit b98055139a
2 changed files with 30 additions and 16 deletions

View File

@@ -109,7 +109,7 @@ public class WebServiceTemplateTests {
WebServiceMessageCallback requestCallback = mock(WebServiceMessageCallback.class);
requestCallback.doWithMessage(isA(WebServiceMessage.class));
WebServiceMessageExtractor extractorMock = mock(WebServiceMessageExtractor.class);
WebServiceMessageExtractor<Object> extractorMock = mockWebServiceMessageExtractor();
Object extracted = new Object();
when(extractorMock.extractData(isA(WebServiceMessage.class))).thenReturn(extracted);
@@ -127,7 +127,7 @@ public class WebServiceTemplateTests {
@Test
public void testSendAndReceiveMessageNoResponse() throws Exception {
WebServiceMessageExtractor extractorMock = mock(WebServiceMessageExtractor.class);
WebServiceMessageExtractor<Object> extractorMock = mockWebServiceMessageExtractor();
this.connectionMock.send(isA(WebServiceMessage.class));
when(this.connectionMock.hasError()).thenReturn(false);
@@ -142,7 +142,7 @@ public class WebServiceTemplateTests {
@Test
public void testSendAndReceiveMessageFault() throws Exception {
WebServiceMessageExtractor extractorMock = mock(WebServiceMessageExtractor.class);
WebServiceMessageExtractor<Object> extractorMock = mockWebServiceMessageExtractor();
FaultMessageResolver faultMessageResolverMock = mock(FaultMessageResolver.class);
this.template.setFaultMessageResolver(faultMessageResolverMock);
@@ -165,7 +165,7 @@ public class WebServiceTemplateTests {
@Test
public void testSendAndReceiveConnectionError() throws Exception {
WebServiceMessageExtractor extractorMock = mock(WebServiceMessageExtractor.class);
WebServiceMessageExtractor<Object> extractorMock = mockWebServiceMessageExtractor();
this.template.setFaultMessageResolver(null);
@@ -184,7 +184,7 @@ public class WebServiceTemplateTests {
@Test
public void testSendAndReceiveSourceResponse() throws Exception {
SourceExtractor extractorMock = mock(SourceExtractor.class);
SourceExtractor<Object> extractorMock = mockSourceExtractor();
Object extracted = new Object();
when(extractorMock.extractData(isA(Source.class))).thenReturn(extracted);
@@ -202,7 +202,7 @@ public class WebServiceTemplateTests {
@Test
public void testSendAndReceiveSourceNoResponse() throws Exception {
SourceExtractor extractorMock = mock(SourceExtractor.class);
SourceExtractor<Object> extractorMock = mockSourceExtractor();
this.connectionMock.send(isA(WebServiceMessage.class));
when(this.connectionMock.hasError()).thenReturn(false);
@@ -321,7 +321,7 @@ public class WebServiceTemplateTests {
WebServiceMessageCallback requestCallback = mock(WebServiceMessageCallback.class);
requestCallback.doWithMessage(isA(WebServiceMessage.class));
WebServiceMessageExtractor extractorMock = mock(WebServiceMessageExtractor.class);
WebServiceMessageExtractor<Object> extractorMock = mockWebServiceMessageExtractor();
Object extracted = new Object();
when(extractorMock.extractData(isA(WebServiceMessage.class))).thenReturn(extracted);
@@ -352,7 +352,7 @@ public class WebServiceTemplateTests {
WebServiceMessageCallback requestCallback = mock(WebServiceMessageCallback.class);
requestCallback.doWithMessage(isA(WebServiceMessage.class));
WebServiceMessageExtractor extractorMock = mock(WebServiceMessageExtractor.class);
WebServiceMessageExtractor<Object> extractorMock = mockWebServiceMessageExtractor();
Object extracted = new Object();
when(extractorMock.extractData(isA(WebServiceMessage.class))).thenReturn(extracted);
@@ -381,7 +381,7 @@ public class WebServiceTemplateTests {
WebServiceMessageCallback requestCallback = mock(WebServiceMessageCallback.class);
requestCallback.doWithMessage(messageContext.getRequest());
WebServiceMessageExtractor extractorMock = mock(WebServiceMessageExtractor.class);
WebServiceMessageExtractor<Object> extractorMock = mockWebServiceMessageExtractor();
Object result = this.template.doSendAndReceive(messageContext, this.connectionMock, requestCallback,
extractorMock);
@@ -406,7 +406,7 @@ public class WebServiceTemplateTests {
WebServiceMessageCallback requestCallback = mock(WebServiceMessageCallback.class);
requestCallback.doWithMessage(messageContext.getRequest());
WebServiceMessageExtractor extractorMock = mock(WebServiceMessageExtractor.class);
WebServiceMessageExtractor<Object> extractorMock = mockWebServiceMessageExtractor();
Object extracted = new Object();
when(extractorMock.extractData(messageContext.getResponse())).thenReturn(extracted);
@@ -441,7 +441,7 @@ public class WebServiceTemplateTests {
}
});
WebServiceMessageExtractor extractorMock = mock(WebServiceMessageExtractor.class);
WebServiceMessageExtractor<Object> extractorMock = mockWebServiceMessageExtractor();
reset(this.connectionMock);
@@ -456,4 +456,12 @@ public class WebServiceTemplateTests {
assertThat(result).isNull();
}
private static WebServiceMessageExtractor<Object> mockWebServiceMessageExtractor() {
return mock(WebServiceMessageExtractor.class);
}
private static SourceExtractor<Object> mockSourceExtractor() {
return mock(SourceExtractor.class);
}
}

View File

@@ -16,6 +16,8 @@
package org.springframework.ws.wsdl.wsdl11.provider;
import java.util.List;
import javax.wsdl.Definition;
import javax.wsdl.Types;
import javax.wsdl.extensions.schema.Schema;
@@ -65,9 +67,9 @@ public class InliningXsdSchemaTypesProviderTests {
Types types = this.definition.getTypes();
assertThat(types).isNotNull();
assertThat(types.getExtensibilityElements()).hasSize(1);
assertThat(getExtensibilityElements(types)).hasSize(1);
Schema wsdlSchema = (Schema) types.getExtensibilityElements().get(0);
Schema wsdlSchema = (Schema) getExtensibilityElements(types).get(0);
assertThat(wsdlSchema.getElement()).isNotNull();
}
@@ -93,15 +95,19 @@ public class InliningXsdSchemaTypesProviderTests {
Types types = this.definition.getTypes();
assertThat(types).isNotNull();
assertThat(types.getExtensibilityElements()).hasSize(2);
assertThat(getExtensibilityElements(types)).hasSize(2);
Schema wsdlSchema = (Schema) types.getExtensibilityElements().get(0);
Schema wsdlSchema = (Schema) getExtensibilityElements(types).get(0);
assertThat(wsdlSchema.getElement()).isNotNull();
wsdlSchema = (Schema) types.getExtensibilityElements().get(1);
wsdlSchema = (Schema) getExtensibilityElements(types).get(1);
assertThat(wsdlSchema.getElement()).isNotNull();
}
private static List<?> getExtensibilityElements(Types types) {
return types.getExtensibilityElements();
}
}