Skip to content

Commit e490948

Browse files
snicollsnicoll
committed
Merge branch '4.0.x'
Closes gh-1551
2 parents 80f17c9 + 03b5f00 commit e490948

File tree

224 files changed

+1101
-1095
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

224 files changed

+1101
-1095
lines changed

‎spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public final void setUp() throws Exception {
3131
}
3232

3333
@Test
34-
public void testCreateEmptyMessage() {
34+
protected void testCreateEmptyMessage() {
3535

3636
WebServiceMessage message = this.messageFactory.createWebServiceMessage();
3737

‎spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTests.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public final void setUp() throws Exception {
8787
}
8888

8989
@Test
90-
public void testDomPayload() throws Exception {
90+
void testDomPayload() throws Exception {
9191

9292
DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance();
9393
documentBuilderFactory.setNamespaceAware(true);
@@ -105,7 +105,7 @@ public void testDomPayload() throws Exception {
105105
}
106106

107107
@Test
108-
public void testEventReaderPayload() throws Exception {
108+
void testEventReaderPayload() throws Exception {
109109

110110
XMLInputFactory inputFactory = XMLInputFactoryUtils.newInstance();
111111
XMLEventReader eventReader = inputFactory.createXMLEventReader(this.payload.getInputStream());
@@ -124,7 +124,7 @@ public void testEventReaderPayload() throws Exception {
124124
}
125125

126126
@Test
127-
public void testReaderPayload() throws Exception {
127+
void testReaderPayload() throws Exception {
128128

129129
Reader reader = new InputStreamReader(this.payload.getInputStream(), StandardCharsets.UTF_8);
130130
StreamSource streamSource = new StreamSource(reader, this.payload.getURL().toString());
@@ -137,7 +137,7 @@ public void testReaderPayload() throws Exception {
137137
}
138138

139139
@Test
140-
public void testSaxPayload() throws Exception {
140+
void testSaxPayload() throws Exception {
141141

142142
SAXSource saxSource = new SAXSource(SaxUtils.createInputSource(this.payload));
143143
this.transformer.transform(saxSource, this.webServiceMessage.getPayloadResult());
@@ -150,7 +150,7 @@ public void testSaxPayload() throws Exception {
150150
}
151151

152152
@Test
153-
public void testStreamPayload() throws Exception {
153+
void testStreamPayload() throws Exception {
154154

155155
StreamSource streamSource = new StreamSource(this.payload.getInputStream(), this.payload.getURL().toString());
156156
this.transformer.transform(streamSource, this.webServiceMessage.getPayloadResult());
@@ -168,7 +168,7 @@ public void testStreamPayload() throws Exception {
168168
}
169169

170170
@Test
171-
public void testStreamReaderPayload() throws Exception {
171+
void testStreamReaderPayload() throws Exception {
172172

173173
XMLInputFactory inputFactory = XMLInputFactoryUtils.newInstance();
174174
XMLStreamReader streamReader = inputFactory.createXMLStreamReader(this.payload.getInputStream());

‎spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTests.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTests {
8484
private Logger logger = LogManager.getLogger();
8585

8686
@BeforeAll
87-
public static void startJetty() throws Exception {
87+
static void startJetty() throws Exception {
8888

8989
int port = FreePortScanner.getFreePort();
9090
baseUrl = "http://localhost:" + port;
@@ -116,24 +116,24 @@ public static void startJetty() throws Exception {
116116
}
117117

118118
@AfterAll
119-
public static void stopJetty() throws Exception {
119+
static void stopJetty() throws Exception {
120120

121121
if (jettyServer.isRunning()) {
122122
jettyServer.stop();
123123
}
124124
}
125125

126126
@BeforeEach
127-
public void createWebServiceTemplate() throws Exception {
127+
void createWebServiceTemplate() throws Exception {
128128

129129
this.template = new WebServiceTemplate(createMessageFactory());
130130
this.template.setMessageSender(new HttpComponentsMessageSender());
131131
}
132132

133-
public abstract SoapMessageFactory createMessageFactory() throws Exception;
133+
protected abstract SoapMessageFactory createMessageFactory() throws Exception;
134134

135135
@Test
136-
public void sendSourceAndReceiveToResult() {
136+
void sendSourceAndReceiveToResult() {
137137

138138
this.logger.info(">>> Test case");
139139

@@ -146,7 +146,7 @@ public void sendSourceAndReceiveToResult() {
146146
}
147147

148148
@Test
149-
public void sendSourceAndReceiveToResultNoResponse() {
149+
void sendSourceAndReceiveToResultNoResponse() {
150150

151151
boolean b = this.template.sendSourceAndReceiveToResult(baseUrl + "/soap/noResponse",
152152
new StringSource(this.messagePayload), new StringResult());
@@ -155,7 +155,7 @@ public void sendSourceAndReceiveToResultNoResponse() {
155155
}
156156

157157
@Test
158-
public void marshalSendAndReceiveResponse() throws TransformerConfigurationException {
158+
void marshalSendAndReceiveResponse() throws TransformerConfigurationException {
159159

160160
final Transformer transformer = TransformerFactoryUtils.newInstance().newTransformer();
161161
final Object requestObject = new Object();
@@ -209,7 +209,7 @@ public boolean supports(Class<?> clazz) {
209209
}
210210

211211
@Test
212-
public void marshalSendAndReceiveNoResponse() throws TransformerConfigurationException {
212+
void marshalSendAndReceiveNoResponse() throws TransformerConfigurationException {
213213

214214
final Transformer transformer = TransformerFactoryUtils.newInstance().newTransformer();
215215
final Object requestObject = new Object();
@@ -245,15 +245,15 @@ public boolean supports(Class<?> clazz) {
245245
}
246246

247247
@Test
248-
public void notFound() {
248+
void notFound() {
249249

250250
assertThatExceptionOfType(WebServiceTransportException.class)
251251
.isThrownBy(() -> this.template.sendSourceAndReceiveToResult(baseUrl + "/errors/notfound",
252252
new StringSource(this.messagePayload), new StringResult()));
253253
}
254254

255255
@Test
256-
public void fault() {
256+
void fault() {
257257

258258
Result result = new StringResult();
259259

@@ -262,7 +262,7 @@ public void fault() {
262262
}
263263

264264
@Test
265-
public void faultNonCompliant() {
265+
void faultNonCompliant() {
266266

267267
Result result = new StringResult();
268268
this.template.setCheckConnectionForFault(false);
@@ -274,7 +274,7 @@ public void faultNonCompliant() {
274274
}
275275

276276
@Test
277-
public void attachment() {
277+
void attachment() {
278278

279279
this.template.sendSourceAndReceiveToResult(baseUrl + "/soap/attachment", new StringSource(this.messagePayload),
280280
message -> {
@@ -311,7 +311,7 @@ private abstract static class AbstractSoapServlet extends HttpServlet {
311311

312312
private int sc = -1;
313313

314-
public void setSc(int sc) {
314+
void setSc(int sc) {
315315
this.sc = sc;
316316
}
317317

‎spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTests.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public static void stopJetty() throws Exception {
123123
* basically reset the command map
124124
*/
125125
@BeforeEach
126-
public void removeXmlDataContentHandler() throws SOAPException {
126+
void removeXmlDataContentHandler() throws SOAPException {
127127

128128
MessageFactory messageFactory = MessageFactory.newInstance();
129129
SOAPMessage message = messageFactory.createMessage();
@@ -132,16 +132,16 @@ public void removeXmlDataContentHandler() throws SOAPException {
132132
}
133133

134134
@BeforeEach
135-
public void createWebServiceTemplate() throws Exception {
135+
void createWebServiceTemplate() throws Exception {
136136

137137
this.template = new WebServiceTemplate(createMessageFactory());
138138
this.template.setMessageSender(new HttpComponentsMessageSender());
139139
}
140140

141-
public abstract SoapMessageFactory createMessageFactory() throws Exception;
141+
protected abstract SoapMessageFactory createMessageFactory() throws Exception;
142142

143143
@Test
144-
public void sendSourceAndReceiveToResult() {
144+
void sendSourceAndReceiveToResult() {
145145

146146
StringResult result = new StringResult();
147147
boolean b = this.template.sendSourceAndReceiveToResult(baseUrl + "/soap/echo",
@@ -152,15 +152,15 @@ public void sendSourceAndReceiveToResult() {
152152
}
153153

154154
@Test
155-
public void sendSourceAndReceiveToResultNoResponse() {
155+
void sendSourceAndReceiveToResultNoResponse() {
156156

157157
boolean b = this.template.sendSourceAndReceiveToResult(baseUrl + "/soap/noResponse",
158158
new StringSource(this.messagePayload), new StringResult());
159159
assertThat(b).isFalse();
160160
}
161161

162162
@Test
163-
public void marshalSendAndReceiveResponse() throws TransformerConfigurationException {
163+
void marshalSendAndReceiveResponse() throws TransformerConfigurationException {
164164

165165
final Transformer transformer = TransformerFactoryUtils.newInstance().newTransformer();
166166
final Object requestObject = new Object();
@@ -214,7 +214,7 @@ public boolean supports(Class<?> clazz) {
214214
}
215215

216216
@Test
217-
public void marshalSendAndReceiveNoResponse() throws TransformerConfigurationException {
217+
void marshalSendAndReceiveNoResponse() throws TransformerConfigurationException {
218218

219219
final Transformer transformer = TransformerFactoryUtils.newInstance().newTransformer();
220220
final Object requestObject = new Object();
@@ -250,15 +250,15 @@ public boolean supports(Class<?> clazz) {
250250
}
251251

252252
@Test
253-
public void notFound() {
253+
void notFound() {
254254

255255
assertThatExceptionOfType(WebServiceTransportException.class)
256256
.isThrownBy(() -> this.template.sendSourceAndReceiveToResult(baseUrl + "/errors/notfound",
257257
new StringSource(this.messagePayload), new StringResult()));
258258
}
259259

260260
@Test
261-
public void receiverFault() {
261+
void receiverFault() {
262262

263263
Result result = new StringResult();
264264

@@ -268,7 +268,7 @@ public void receiverFault() {
268268
}
269269

270270
@Test
271-
public void senderFault() {
271+
void senderFault() {
272272

273273
Result result = new StringResult();
274274

@@ -278,7 +278,7 @@ public void senderFault() {
278278
}
279279

280280
@Test
281-
public void attachment() {
281+
void attachment() {
282282

283283
this.template.sendSourceAndReceiveToResult(baseUrl + "/soap/attachment", new StringSource(this.messagePayload),
284284
message -> {

‎spring-ws-core/src/test/java/org/springframework/ws/client/core/DomPoxWebServiceTemplateIntegrationTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@
5252

5353
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
5454

55-
public class DomPoxWebServiceTemplateIntegrationTests {
55+
class DomPoxWebServiceTemplateIntegrationTests {
5656

5757
private static Server jettyServer;
5858

5959
private static String baseUrl;
6060

6161
@BeforeAll
62-
public static void startJetty() throws Exception {
62+
static void startJetty() throws Exception {
6363

6464
int port = FreePortScanner.getFreePort();
6565
baseUrl = "http://localhost:" + port;
@@ -84,15 +84,15 @@ public static void startJetty() throws Exception {
8484
}
8585

8686
@AfterAll
87-
public static void stopJetty() throws Exception {
87+
static void stopJetty() throws Exception {
8888

8989
if (jettyServer.isRunning()) {
9090
jettyServer.stop();
9191
}
9292
}
9393

9494
@Test
95-
public void domPox() {
95+
void domPox() {
9696

9797
WebServiceTemplate template = new WebServiceTemplate(new DomPoxMessageFactory());
9898
template.setMessageSender(new HttpComponentsMessageSender());

‎spring-ws-core/src/test/java/org/springframework/ws/client/core/SaajSoap11WebServiceTemplateIntegrationTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
/**
2626
* @author Arjen Poutsma
2727
*/
28-
public class SaajSoap11WebServiceTemplateIntegrationTests extends AbstractSoap11WebServiceTemplateIntegrationTests {
28+
class SaajSoap11WebServiceTemplateIntegrationTests extends AbstractSoap11WebServiceTemplateIntegrationTests {
2929

3030
@Override
31-
public SoapMessageFactory createMessageFactory() throws Exception {
31+
protected SoapMessageFactory createMessageFactory() throws Exception {
3232

3333
MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL);
3434
return new SaajSoapMessageFactory(messageFactory);

‎spring-ws-core/src/test/java/org/springframework/ws/client/core/SaajSoap12WebServiceTemplateIntegrationTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
/**
2626
* @author Arjen Poutsma
2727
*/
28-
public class SaajSoap12WebServiceTemplateIntegrationTests extends AbstractSoap12WebServiceTemplateIntegrationTests {
28+
class SaajSoap12WebServiceTemplateIntegrationTests extends AbstractSoap12WebServiceTemplateIntegrationTests {
2929

3030
@Override
31-
public SoapMessageFactory createMessageFactory() throws Exception {
31+
protected SoapMessageFactory createMessageFactory() throws Exception {
3232

3333
MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL);
3434
return new SaajSoapMessageFactory(messageFactory);

‎spring-ws-core/src/test/java/org/springframework/ws/client/core/SimpleFaultMessageResolverTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@
2828
import static org.easymock.EasyMock.replay;
2929
import static org.easymock.EasyMock.verify;
3030

31-
public class SimpleFaultMessageResolverTests {
31+
class SimpleFaultMessageResolverTests {
3232

3333
private SimpleFaultMessageResolver resolver;
3434

3535
@BeforeEach
36-
public void setUp() {
36+
void setUp() {
3737
this.resolver = new SimpleFaultMessageResolver();
3838
}
3939

4040
@Test
41-
public void testResolveFault() {
41+
void testResolveFault() {
4242

4343
FaultAwareWebServiceMessage messageMock = createMock(FaultAwareWebServiceMessage.class);
4444
String message = "message";

0 commit comments

Comments
 (0)