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

DATACMNS-357 - Cleanups in primitive id detection.

Browse Source 
Changed implementation in AbstractEntityInformation quite a bit to not need the non-final fields and a protected callback method. Cleaned up test cases to really test the new behavior, not the artificially introduced test helper class.

Original pull request: #37.
This commit is contained in:
Oliver Gierke
2013-08-14 09:18:26 +02:00
parent 98b8129a74
commit 9843447a58
4 changed files with 109 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/org/springframework/data/repository/core/support/AbstractEntityInformation.java
View File

@@ -31,13 +31,10 @@ public abstract class AbstractEntityInformation<T, ID extends Serializable> impl
private final Class<T> domainClass;
private boolean idTypePrimitiveSet;
private boolean idTypePrimitive;
/**
* Creates a new {@link AbstractEntityInformation} from the given domain class.
*
* @param domainClass
* @param domainClass must not be {@literal null}.
*/
public AbstractEntityInformation(Class<T> domainClass) {
@@ -46,36 +43,30 @@ public abstract class AbstractEntityInformation<T, ID extends Serializable> impl
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.data.repository.support.IsNewAware#isNew(java.lang
* .Object)
*/
* (non-Javadoc)
* @see org.springframework.data.repository.core.EntityInformation#isNew(java.lang.Object)
*/
public boolean isNew(T entity) {
ID id = getId(entity);
return id == null || this.isIdTypePrimitive() && id instanceof Number && ((Number) id).longValue() == 0;
Class<ID> idType = getIdType();
if (!idType.isPrimitive()) {
return id == null;
}
if (id instanceof Number) {
return ((Number) id).longValue() == 0L;
}
throw new IllegalArgumentException(String.format("Unsupported primitive id type %s!", idType));
}
/*
* (non-Javadoc)
*
* @see
* org.springframework.data.repository.support.EntityInformation#getJavaType
* ()
*/
* (non-Javadoc)
* @see org.springframework.data.repository.core.EntityMetadata#getJavaType()
*/
public Class<T> getJavaType() {
return this.domainClass;
}
protected boolean isIdTypePrimitive() {
if (!this.idTypePrimitiveSet) {
this.idTypePrimitive = getIdType() != null && getIdType().isPrimitive();
this.idTypePrimitiveSet = true;
}
return this.idTypePrimitive;
}
}