Browse Source

Explicit nullability declarations for getTarget() implementations

5.0.x
Juergen Hoeller 5 years ago
parent
commit
9f2d8d4099
  1. 7
      spring-context/src/main/java/org/springframework/validation/BindException.java
  2. 7
      spring-context/src/main/java/org/springframework/validation/MapBindingResult.java
  3. 3
      spring-web/src/main/java/org/springframework/web/bind/support/WebExchangeBindException.java

7
spring-context/src/main/java/org/springframework/validation/BindException.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -58,7 +58,7 @@ public class BindException extends Exception implements BindingResult { @@ -58,7 +58,7 @@ public class BindException extends Exception implements BindingResult {
/**
* Create a new BindException instance for a target bean.
* @param target target bean to bind onto
* @param target the target bean to bind onto
* @param objectName the name of the target object
* @see BeanPropertyBindingResult
*/
@ -70,8 +70,6 @@ public class BindException extends Exception implements BindingResult { @@ -70,8 +70,6 @@ public class BindException extends Exception implements BindingResult {
/**
* Return the BindingResult that this BindException wraps.
* Will typically be a BeanPropertyBindingResult.
* @see BeanPropertyBindingResult
*/
public final BindingResult getBindingResult() {
return this.bindingResult;
@ -231,6 +229,7 @@ public class BindException extends Exception implements BindingResult { @@ -231,6 +229,7 @@ public class BindException extends Exception implements BindingResult {
}
@Override
@Nullable
public Object getTarget() {
return this.bindingResult.getTarget();
}

7
spring-context/src/main/java/org/springframework/validation/MapBindingResult.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2006 the original author or authors.
* Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -19,6 +19,7 @@ package org.springframework.validation; @@ -19,6 +19,7 @@ package org.springframework.validation;
import java.io.Serializable;
import java.util.Map;
import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
@ -52,11 +53,15 @@ public class MapBindingResult extends AbstractBindingResult implements Serializa @@ -52,11 +53,15 @@ public class MapBindingResult extends AbstractBindingResult implements Serializa
}
/**
* Return the target Map to bind onto.
*/
public final Map<?, ?> getTargetMap() {
return this.target;
}
@Override
@NonNull
public final Object getTarget() {
return this.target;
}

3
spring-web/src/main/java/org/springframework/web/bind/support/WebExchangeBindException.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -217,6 +217,7 @@ public class WebExchangeBindException extends ServerWebInputException implements @@ -217,6 +217,7 @@ public class WebExchangeBindException extends ServerWebInputException implements
}
@Override
@Nullable
public Object getTarget() {
return this.bindingResult.getTarget();
}

Loading…
Cancel
Save