Skip to content

Commit d2e2d3f

Browse files
committed
Merge branch '5.0.x'
Closes gh-1770 in 5.1.x
2 parents e167243 + a3c729a commit d2e2d3f

2 files changed

Lines changed: 1 addition & 3 deletions

File tree

gradle/plugins/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ assertJVersion=3.25.3
22
gradleVersionsPluginVersion=0.53.0
33
javaFormatVersion=0.0.47
44
junitVersion=6.0.1
5-
nullabilityPluginVersion=0.0.10
5+
nullabilityPluginVersion=0.0.11

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.xml.sax.InputSource;
3737
import org.xml.sax.XMLReader;
3838

39-
import org.springframework.lang.Contract;
4039
import org.springframework.xml.namespace.QNameUtils;
4140
import org.springframework.xml.transform.TransformerHelper;
4241
import org.springframework.xml.transform.TraxUtils;
@@ -59,7 +58,6 @@ private PayloadRootUtils() {
5958
* not a {@code DOMSource}
6059
* @return the root element, or {@code null} if {@code source} is {@code null}
6160
*/
62-
@Contract("!null, _ -> !null")
6361
public static @Nullable QName getPayloadRootQName(@Nullable Source source, TransformerFactory transformerFactory)
6462
throws TransformerException {
6563
return getPayloadRootQName(source, new TransformerHelper(transformerFactory));

0 commit comments

Comments
 (0)