Polishing.

All of these instanceof checks can also take advantage of Java 17's pattern matching instanceof operator.

Related: #1326.

Author: gregturn

spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/MethodEndpoint.java

@@ -156,8 +156,7 @@ public boolean equals(Object o) {
 		if (this == o) {
 			return true;
 		}
-		if (o instanceof MethodEndpoint) {
-			MethodEndpoint other = (MethodEndpoint) o;
+		if (o instanceof MethodEndpoint other) {
 			return this.bean.equals(other.bean) && this.method.equals(other.method);
 		}
 		return false;

spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapter.java

@@ -127,8 +127,7 @@ protected void invokeInternal(MessageContext messageContext, MethodEndpoint meth
 		Element payloadElement = getRootElement(messageContext.getRequest().getPayloadSource());
 		Object[] args = getMethodArguments(payloadElement, methodEndpoint.getMethod());
 		Object result = methodEndpoint.invoke(args);
-		if (result instanceof Source) {
-			Source responseSource = (Source) result;
+		if (result instanceof Source responseSource) {
 			WebServiceMessage response = messageContext.getResponse();
 			transform(responseSource, response.getPayloadResult());
 		}

spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/core/EndpointReference.java

@@ -90,8 +90,7 @@ public boolean equals(Object o) {
 		if (this == o) {
 			return true;
 		}
-		if (o instanceof EndpointReference) {
-			EndpointReference other = (EndpointReference) o;
+		if (o instanceof EndpointReference other) {
 			return address.equals(other.address);
 		}
 		return false;

spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jSecurityInterceptor.java

@@ -852,8 +852,7 @@ private void processPrincipal(WSHandlerResult result) {
 		if (!CollectionUtils.isEmpty(results)) {
 			WSSecurityEngineResult actionResult = results.get(0);
 			Principal principal = (Principal) actionResult.get(WSSecurityEngineResult.TAG_PRINCIPAL);
-			if (principal instanceof WSUsernameTokenPrincipalImpl) {
-				WSUsernameTokenPrincipalImpl usernameTokenPrincipal = (WSUsernameTokenPrincipalImpl) principal;
+			if (principal instanceof WSUsernameTokenPrincipalImpl usernameTokenPrincipal) {
 				UsernameTokenPrincipalCallback callback = new UsernameTokenPrincipalCallback(usernameTokenPrincipal);
 				try {
 					validationCallbackHandler.handle(new Callback[] { callback });

spring-xml/src/main/java/org/springframework/xml/namespace/QNameEditor.java

@@ -62,10 +62,7 @@ public void setAsText(String text) throws IllegalArgumentException {
 	@Override
 	public String getAsText() {
 		Object value = getValue();
-		if (!(value instanceof QName)) {
-			return "";
-		} else {
-			QName qName = (QName) value;
+		if (value instanceof QName qName) {
 			String prefix = qName.getPrefix();
 			if (StringUtils.hasLength(qName.getNamespaceURI()) && StringUtils.hasLength(prefix)) {
 				return "{" + qName.getNamespaceURI() + "}" + prefix + ":" + qName.getLocalPart();
@@ -74,6 +71,8 @@ public String getAsText() {
 			} else {
 				return qName.getLocalPart();
 			}
+		} else {
+			return "";
 		}
 	}
 }