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

DATAJPA-1530 - Polishing.

Browse Source 
Simplified generics.

Original pull request: #376.
This commit is contained in:
Jens Schauder
2019-04-24 14:56:41 +02:00
committed by Mark Paluch
parent 6eca6c99fc
commit f89dd2c0ac
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformation.java
View File

@@ -85,7 +85,7 @@ public class JpaMetamodelEntityInformation<T, ID> extends JpaEntityInformationSu
IdentifiableType<T> identifiableType = (IdentifiableType<T>) type;
this.idMetadata = new IdMetadata<T>(identifiableType);
this.idMetadata = new IdMetadata<>(identifiableType);
this.versionAttribute = findVersionAttribute(identifiableType, metamodel);
}
@@ -206,7 +206,7 @@ public class JpaMetamodelEntityInformation<T, ID> extends JpaEntityInformationSu
@Override
public Iterable<String> getIdAttributeNames() {
List<String> attributeNames = new ArrayList<String>(idMetadata.attributes.size());
List<String> attributeNames = new ArrayList<>(idMetadata.attributes.size());
for (SingularAttribute<? super T, ?> attribute : idMetadata.attributes) {
attributeNames.add(attribute.getName());
@@ -257,7 +257,7 @@ public class JpaMetamodelEntityInformation<T, ID> extends JpaEntityInformationSu
private @Nullable Class<?> idType;
@SuppressWarnings("unchecked")
public IdMetadata(IdentifiableType<T> source) {
IdMetadata(IdentifiableType<T> source) {
this.type = source;
this.attributes = (Set<SingularAttribute<? super T, ?>>) (source.hasSingleIdAttribute()
@@ -265,7 +265,7 @@ public class JpaMetamodelEntityInformation<T, ID> extends JpaEntityInformationSu
: source.getIdClassAttributes());
}
public boolean hasSimpleId() {
boolean hasSimpleId() {
return attributes.size() == 1;
}
@@ -304,7 +304,7 @@ public class JpaMetamodelEntityInformation<T, ID> extends JpaEntityInformationSu
return annotation == null ? null : annotation.value();
}
public SingularAttribute<? super T, ?> getSimpleIdAttribute() {
SingularAttribute<? super T, ?> getSimpleIdAttribute() {
return attributes.iterator().next();
}
@@ -383,7 +383,7 @@ public class JpaMetamodelEntityInformation<T, ID> extends JpaEntityInformationSu
if (idPropertyValue != null) {
Class<? extends Object> idPropertyValueType = idPropertyValue.getClass();
Class<?> idPropertyValueType = idPropertyValue.getClass();
if (!jpaMetamodel.isJpaManaged(idPropertyValueType)) {
return idPropertyValue;
@@ -396,10 +396,10 @@ public class JpaMetamodelEntityInformation<T, ID> extends JpaEntityInformationSu
return null;
}
private String tryFindSingularIdAttributeNameOrUseFallback(Class<? extends Object> idPropertyValueType,
private String tryFindSingularIdAttributeNameOrUseFallback(Class<?> idPropertyValueType,
String fallbackIdTypePropertyName) {
ManagedType<? extends Object> idPropertyType = metamodel.managedType(idPropertyValueType);
ManagedType<?> idPropertyType = metamodel.managedType(idPropertyValueType);
for (SingularAttribute<?, ?> sa : idPropertyType.getSingularAttributes()) {
if (sa.isId()) {
return sa.getName();
@@ -421,7 +421,7 @@ public class JpaMetamodelEntityInformation<T, ID> extends JpaEntityInformationSu
}
try {
ManagedType<? extends Object> managedType = this.metamodel.managedType(ProxyUtils.getUserClass(value));
ManagedType<?> managedType = this.metamodel.managedType(ProxyUtils.getUserClass(value));
return managedType != null && managedType.getPersistenceType() == PersistenceType.ENTITY;
} catch (IllegalArgumentException iae) {
// no mapped type