Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACMNS-934 - BasicPersistentEntity.addAssociation(…) drops null values now.

Browse Source 
Previously a null value was added to the list of associations if it was handed to BasicaPersistentEntity.addAssociation(…). We now drop those null values and log a warning as it usually indicates a MappingContext implementation identifying a property as association but subsequently failing to look it up.
This commit is contained in:
Oliver Gierke
2016-12-05 16:39:05 +01:00
parent 9354800225
commit d3f235872c
2 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/springframework/data/mapping/model/BasicPersistentEntity.java
View File

@@ -30,6 +30,8 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.annotation.AnnotatedElementUtils;
import org.springframework.data.annotation.TypeAlias;
import org.springframework.data.mapping.Association;
@@ -58,7 +60,9 @@ import org.springframework.util.StringUtils;
*/
public class BasicPersistentEntity<T, P extends PersistentProperty<P>> implements MutablePersistentEntity<T, P> {
private static final Logger LOGGER = LoggerFactory.getLogger(BasicPersistentEntity.class);
private static final String TYPE_MISMATCH = "Target bean of type %s is not of type of the persistent entity (%s)!";
private static final String NULL_ASSOCIATION = "%s.addAssociation(…) was called with a null association! Usually indicates a problem in a Spring Data MappingContext implementation. Be sure to file a bug at https://jira.spring.io!";
private final PreferredConstructor<T, P> constructor;
private final TypeInformation<T> information;
@@ -236,11 +240,17 @@ public class BasicPersistentEntity<T, P extends PersistentProperty<P>> implement
return property;
}
/* (non-Javadoc)
/*
* (non-Javadoc)
* @see org.springframework.data.mapping.MutablePersistentEntity#addAssociation(org.springframework.data.mapping.model.Association)
*/
public void addAssociation(Association<P> association) {
if (association == null) {
LOGGER.warn(String.format(NULL_ASSOCIATION, this.getClass().getName()));
return;
}
if (!associations.contains(association)) {
associations.add(association);
}