Skip to content

Commit 60ec66c

Browse files
snicollsnicoll
committed
Add 'this.' for field access
See gh-1479
1 parent b70e291 commit 60ec66c

File tree

383 files changed

+4469
-4387
lines changed

Some content is hidden

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

383 files changed

+4469
-4387
lines changed

‎spring-ws-core/src/main/java/org/springframework/ws/client/WebServiceFaultException.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class WebServiceFaultException extends WebServiceClientException {
3232
/** Create a new instance of the {@code WebServiceFaultException} class. */
3333
public WebServiceFaultException(String msg) {
3434
super(msg);
35-
faultMessage = null;
35+
this.faultMessage = null;
3636
}
3737

3838
/**
@@ -46,7 +46,7 @@ public WebServiceFaultException(FaultAwareWebServiceMessage faultMessage) {
4646

4747
/** Returns the fault message. */
4848
public FaultAwareWebServiceMessage getWebServiceMessage() {
49-
return faultMessage;
49+
return this.faultMessage;
5050
}
5151

5252
}

‎spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,8 @@ public WebServiceTemplate(Marshaller marshaller, Unmarshaller unmarshaller) {
206206
* Returns the default URI to be used on operations that do not have a URI parameter.
207207
*/
208208
public String getDefaultUri() {
209-
if (destinationProvider != null) {
210-
URI uri = destinationProvider.getDestination();
209+
if (this.destinationProvider != null) {
210+
URI uri = this.destinationProvider.getDestination();
211211
return uri != null ? uri.toString() : null;
212212
}
213213
else {
@@ -229,7 +229,7 @@ public String getDefaultUri() {
229229
* @see #sendAndReceive(WebServiceMessageCallback,WebServiceMessageCallback)
230230
*/
231231
public void setDefaultUri(final String uri) {
232-
destinationProvider = new DestinationProvider() {
232+
this.destinationProvider = new DestinationProvider() {
233233

234234
public URI getDestination() {
235235
return URI.create(uri);
@@ -242,7 +242,7 @@ public URI getDestination() {
242242
* parameter.
243243
*/
244244
public DestinationProvider getDestinationProvider() {
245-
return destinationProvider;
245+
return this.destinationProvider;
246246
}
247247

248248
/**
@@ -265,7 +265,7 @@ public void setDestinationProvider(DestinationProvider destinationProvider) {
265265

266266
/** Returns the marshaller for this template. */
267267
public Marshaller getMarshaller() {
268-
return marshaller;
268+
return this.marshaller;
269269
}
270270

271271
/** Sets the marshaller for this template. */
@@ -275,7 +275,7 @@ public void setMarshaller(Marshaller marshaller) {
275275

276276
/** Returns the unmarshaller for this template. */
277277
public Unmarshaller getUnmarshaller() {
278-
return unmarshaller;
278+
return this.unmarshaller;
279279
}
280280

281281
/** Sets the unmarshaller for this template. */
@@ -285,7 +285,7 @@ public void setUnmarshaller(Unmarshaller unmarshaller) {
285285

286286
/** Returns the fault message resolver for this template. */
287287
public FaultMessageResolver getFaultMessageResolver() {
288-
return faultMessageResolver;
288+
return this.faultMessageResolver;
289289
}
290290

291291
/**
@@ -347,7 +347,7 @@ public void setCheckConnectionForFault(boolean checkConnectionForFault) {
347347
* @return array of endpoint interceptors, or {@code null} if none
348348
*/
349349
public ClientInterceptor[] getInterceptors() {
350-
return interceptors;
350+
return this.interceptors;
351351
}
352352

353353
/**
@@ -613,10 +613,10 @@ protected <T> T doSendAndReceive(MessageContext messageContext, WebServiceConnec
613613
}
614614
// Apply handleRequest of registered interceptors
615615
boolean intercepted = false;
616-
if (interceptors != null) {
617-
for (int i = 0; i < interceptors.length; i++) {
616+
if (this.interceptors != null) {
617+
for (int i = 0; i < this.interceptors.length; i++) {
618618
interceptorIndex = i;
619-
if (!interceptors[i].handleRequest(messageContext)) {
619+
if (!this.interceptors[i].handleRequest(messageContext)) {
620620
intercepted = true;
621621
break;
622622
}
@@ -687,9 +687,9 @@ else if (sentMessageTracingLogger.isDebugEnabled()) {
687687
* @throws IOException in case of I/O errors
688688
*/
689689
protected boolean hasError(WebServiceConnection connection, WebServiceMessage request) throws IOException {
690-
if (checkConnectionForError && connection.hasError()) {
690+
if (this.checkConnectionForError && connection.hasError()) {
691691
// could be a fault
692-
if (checkConnectionForFault && connection instanceof FaultAwareWebServiceConnection faultConnection) {
692+
if (this.checkConnectionForFault && connection instanceof FaultAwareWebServiceConnection faultConnection) {
693693
return !(faultConnection.hasFault() && request instanceof FaultAwareWebServiceMessage);
694694
}
695695
else {
@@ -709,8 +709,8 @@ protected boolean hasError(WebServiceConnection connection, WebServiceMessage re
709709
* if any
710710
*/
711711
protected Object handleError(WebServiceConnection connection, WebServiceMessage request) throws IOException {
712-
if (logger.isDebugEnabled()) {
713-
logger.debug("Received error for request [" + request + "]");
712+
if (this.logger.isDebugEnabled()) {
713+
this.logger.debug("Received error for request [" + request + "]");
714714
}
715715
throw new WebServiceTransportException(connection.getErrorMessage());
716716
}
@@ -754,7 +754,7 @@ else if (receivedMessageTracingLogger.isDebugEnabled()) {
754754
* @throws IOException in case of I/O errors
755755
*/
756756
protected boolean hasFault(WebServiceConnection connection, WebServiceMessage response) throws IOException {
757-
if (checkConnectionForFault && connection instanceof FaultAwareWebServiceConnection faultConnection) {
757+
if (this.checkConnectionForFault && connection instanceof FaultAwareWebServiceConnection faultConnection) {
758758
// check whether the connection has a fault (i.e. status code 500 in HTTP)
759759
if (!faultConnection.hasFault()) {
760760
return false;
@@ -778,9 +778,9 @@ protected boolean hasFault(WebServiceConnection connection, WebServiceMessage re
778778
* @see ClientInterceptor#handleFault(MessageContext)
779779
*/
780780
private void triggerHandleResponse(int interceptorIndex, MessageContext messageContext) {
781-
if (messageContext.hasResponse() && interceptors != null) {
781+
if (messageContext.hasResponse() && this.interceptors != null) {
782782
for (int i = interceptorIndex; i >= 0; i--) {
783-
if (!interceptors[i].handleResponse(messageContext)) {
783+
if (!this.interceptors[i].handleResponse(messageContext)) {
784784
break;
785785
}
786786
}
@@ -797,9 +797,9 @@ private void triggerHandleResponse(int interceptorIndex, MessageContext messageC
797797
* @see ClientInterceptor#handleFault(MessageContext)
798798
*/
799799
private void triggerHandleFault(int interceptorIndex, MessageContext messageContext) {
800-
if (messageContext.hasResponse() && interceptors != null) {
800+
if (messageContext.hasResponse() && this.interceptors != null) {
801801
for (int i = interceptorIndex; i >= 0; i--) {
802-
if (!interceptors[i].handleFault(messageContext)) {
802+
if (!this.interceptors[i].handleFault(messageContext)) {
803803
break;
804804
}
805805
}
@@ -818,9 +818,9 @@ private void triggerHandleFault(int interceptorIndex, MessageContext messageCont
818818
*/
819819
private void triggerAfterCompletion(int interceptorIndex, MessageContext messageContext, Exception ex)
820820
throws WebServiceClientException {
821-
if (interceptors != null) {
821+
if (this.interceptors != null) {
822822
for (int i = interceptorIndex; i >= 0; i--) {
823-
interceptors[i].afterCompletion(messageContext, ex);
823+
this.interceptors[i].afterCompletion(messageContext, ex);
824824
}
825825
}
826826
}
@@ -836,8 +836,8 @@ private void triggerAfterCompletion(int interceptorIndex, MessageContext message
836836
* if any
837837
*/
838838
protected Object handleFault(WebServiceConnection connection, MessageContext messageContext) throws IOException {
839-
if (logger.isDebugEnabled()) {
840-
logger.debug("Received Fault message for request [" + messageContext.getRequest() + "]");
839+
if (this.logger.isDebugEnabled()) {
840+
this.logger.debug("Received Fault message for request [" + messageContext.getRequest() + "]");
841841
}
842842
if (getFaultMessageResolver() != null) {
843843
getFaultMessageResolver().resolveFault(messageContext.getResponse());
@@ -862,7 +862,7 @@ private WebServiceMessageCallbackMessageExtractor(WebServiceMessageCallback call
862862

863863
@Override
864864
public Boolean extractData(WebServiceMessage message) throws IOException, TransformerException {
865-
callback.doWithMessage(message);
865+
this.callback.doWithMessage(message);
866866
return Boolean.TRUE;
867867
}
868868

@@ -879,7 +879,7 @@ private SourceExtractorMessageExtractor(SourceExtractor<T> sourceExtractor) {
879879

880880
@Override
881881
public T extractData(WebServiceMessage message) throws IOException, TransformerException {
882-
return sourceExtractor.extractData(message.getPayloadSource());
882+
return this.sourceExtractor.extractData(message.getPayloadSource());
883883
}
884884

885885
}

‎spring-ws-core/src/main/java/org/springframework/ws/client/core/support/WebServiceGatewaySupport.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public abstract class WebServiceGatewaySupport implements InitializingBean {
6767
* default {@code WebServiceTemplate}.
6868
*/
6969
protected WebServiceGatewaySupport() {
70-
webServiceTemplate = new WebServiceTemplate();
70+
this.webServiceTemplate = new WebServiceTemplate();
7171
}
7272

7373
/**
@@ -76,57 +76,57 @@ protected WebServiceGatewaySupport() {
7676
* @param messageFactory the message factory to use
7777
*/
7878
protected WebServiceGatewaySupport(WebServiceMessageFactory messageFactory) {
79-
webServiceTemplate = new WebServiceTemplate(messageFactory);
79+
this.webServiceTemplate = new WebServiceTemplate(messageFactory);
8080
}
8181

8282
/** Returns the {@code WebServiceMessageFactory} used by the gateway. */
8383
public final WebServiceMessageFactory getMessageFactory() {
84-
return webServiceTemplate.getMessageFactory();
84+
return this.webServiceTemplate.getMessageFactory();
8585
}
8686

8787
/** Set the {@code WebServiceMessageFactory} to be used by the gateway. */
8888
public final void setMessageFactory(WebServiceMessageFactory messageFactory) {
89-
webServiceTemplate.setMessageFactory(messageFactory);
89+
this.webServiceTemplate.setMessageFactory(messageFactory);
9090
}
9191

9292
/** Returns the default URI used by the gateway. */
9393
public final String getDefaultUri() {
94-
return webServiceTemplate.getDefaultUri();
94+
return this.webServiceTemplate.getDefaultUri();
9595
}
9696

9797
/** Sets the default URI used by the gateway. */
9898
public final void setDefaultUri(String uri) {
99-
webServiceTemplate.setDefaultUri(uri);
99+
this.webServiceTemplate.setDefaultUri(uri);
100100
}
101101

102102
/** Returns the destination provider used by the gateway. */
103103
public final DestinationProvider getDestinationProvider() {
104-
return webServiceTemplate.getDestinationProvider();
104+
return this.webServiceTemplate.getDestinationProvider();
105105
}
106106

107107
/** Set the destination provider URI used by the gateway. */
108108
public final void setDestinationProvider(DestinationProvider destinationProvider) {
109-
webServiceTemplate.setDestinationProvider(destinationProvider);
109+
this.webServiceTemplate.setDestinationProvider(destinationProvider);
110110
}
111111

112112
/** Sets a single {@code WebServiceMessageSender} to be used by the gateway. */
113113
public final void setMessageSender(WebServiceMessageSender messageSender) {
114-
webServiceTemplate.setMessageSender(messageSender);
114+
this.webServiceTemplate.setMessageSender(messageSender);
115115
}
116116

117117
/** Returns the {@code WebServiceMessageSender}s used by the gateway. */
118118
public final WebServiceMessageSender[] getMessageSenders() {
119-
return webServiceTemplate.getMessageSenders();
119+
return this.webServiceTemplate.getMessageSenders();
120120
}
121121

122122
/** Sets multiple {@code WebServiceMessageSender} to be used by the gateway. */
123123
public final void setMessageSenders(WebServiceMessageSender[] messageSenders) {
124-
webServiceTemplate.setMessageSenders(messageSenders);
124+
this.webServiceTemplate.setMessageSenders(messageSenders);
125125
}
126126

127127
/** Returns the {@code WebServiceTemplate} for the gateway. */
128128
public final WebServiceTemplate getWebServiceTemplate() {
129-
return webServiceTemplate;
129+
return this.webServiceTemplate;
130130
}
131131

132132
/**
@@ -146,7 +146,7 @@ public final void setWebServiceTemplate(WebServiceTemplate webServiceTemplate) {
146146

147147
/** Returns the {@code Marshaller} used by the gateway. */
148148
public final Marshaller getMarshaller() {
149-
return webServiceTemplate.getMarshaller();
149+
return this.webServiceTemplate.getMarshaller();
150150
}
151151

152152
/**
@@ -156,12 +156,12 @@ public final Marshaller getMarshaller() {
156156
* @see WebServiceTemplate#marshalSendAndReceive
157157
*/
158158
public final void setMarshaller(Marshaller marshaller) {
159-
webServiceTemplate.setMarshaller(marshaller);
159+
this.webServiceTemplate.setMarshaller(marshaller);
160160
}
161161

162162
/** Returns the {@code Unmarshaller} used by the gateway. */
163163
public final Unmarshaller getUnmarshaller() {
164-
return webServiceTemplate.getUnmarshaller();
164+
return this.webServiceTemplate.getUnmarshaller();
165165
}
166166

167167
/**
@@ -171,22 +171,22 @@ public final Unmarshaller getUnmarshaller() {
171171
* @see WebServiceTemplate#marshalSendAndReceive
172172
*/
173173
public final void setUnmarshaller(Unmarshaller unmarshaller) {
174-
webServiceTemplate.setUnmarshaller(unmarshaller);
174+
this.webServiceTemplate.setUnmarshaller(unmarshaller);
175175
}
176176

177177
/** Returns the {@code ClientInterceptors} used by the template. */
178178
public final ClientInterceptor[] getInterceptors() {
179-
return webServiceTemplate.getInterceptors();
179+
return this.webServiceTemplate.getInterceptors();
180180
}
181181

182182
/** Sets the {@code ClientInterceptors} used by the gateway. */
183183
public final void setInterceptors(ClientInterceptor[] interceptors) {
184-
webServiceTemplate.setInterceptors(interceptors);
184+
this.webServiceTemplate.setInterceptors(interceptors);
185185
}
186186

187187
@Override
188188
public final void afterPropertiesSet() throws Exception {
189-
webServiceTemplate.afterPropertiesSet();
189+
this.webServiceTemplate.afterPropertiesSet();
190190
initGateway();
191191
}
192192

‎spring-ws-core/src/main/java/org/springframework/ws/client/support/WebServiceAccessor.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public abstract class WebServiceAccessor extends TransformerObjectSupport implem
4747

4848
/** Returns the message factory used for creating messages. */
4949
public WebServiceMessageFactory getMessageFactory() {
50-
return messageFactory;
50+
return this.messageFactory;
5151
}
5252

5353
/** Sets the message factory used for creating messages. */
@@ -57,7 +57,7 @@ public void setMessageFactory(WebServiceMessageFactory messageFactory) {
5757

5858
/** Returns the message senders used for sending messages. */
5959
public WebServiceMessageSender[] getMessageSenders() {
60-
return messageSenders;
60+
return this.messageSenders;
6161
}
6262

6363
/**
@@ -69,7 +69,7 @@ public WebServiceMessageSender[] getMessageSenders() {
6969
*/
7070
public void setMessageSender(WebServiceMessageSender messageSender) {
7171
Assert.notNull(messageSender, "'messageSender' must not be null");
72-
messageSenders = new WebServiceMessageSender[] { messageSender };
72+
this.messageSenders = new WebServiceMessageSender[] { messageSender };
7373
}
7474

7575
/**
@@ -109,9 +109,9 @@ protected WebServiceConnection createConnection(URI uri) throws IOException {
109109
for (WebServiceMessageSender messageSender : messageSenders) {
110110
if (messageSender.supports(uri)) {
111111
WebServiceConnection connection = messageSender.createConnection(uri);
112-
if (logger.isDebugEnabled()) {
112+
if (this.logger.isDebugEnabled()) {
113113
try {
114-
logger.debug("Opening [" + connection + "] to [" + connection.getUri() + "]");
114+
this.logger.debug("Opening [" + connection + "] to [" + connection.getUri() + "]");
115115
}
116116
catch (URISyntaxException e) {
117117
// ignore

‎spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/AbstractCachingDestinationProvider.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ public void setCache(boolean cache) {
5151

5252
@Override
5353
public final URI getDestination() {
54-
if (cache) {
55-
if (cachedUri == null) {
56-
cachedUri = lookupDestination();
54+
if (this.cache) {
55+
if (this.cachedUri == null) {
56+
this.cachedUri = lookupDestination();
5757
}
58-
return cachedUri;
58+
return this.cachedUri;
5959
}
6060
else {
6161
return lookupDestination();

0 commit comments

Comments
 (0)