Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add missing @Override annotations 

and Extract a function
This commit is contained in:
Gavin King 2023-07-03 15:05:32 +02:00
parent 617ce3206e
commit b6eabdf17d
2 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
hibernate-core/src/main/java/org/hibernate/metamodel/internal/PluralAttributeMetadataImpl.java
View File

@ -53,11 +53,11 @@ class PluralAttributeMetadataImpl<X, Y, E>
case MAP:
case SORTED_MAP:
case ORDERED_MAP: {
this.keyJavaType = signatureType != null
keyJavaType = signatureType != null
? getClassFromGenericArgument( signatureType.getActualTypeArguments()[0] )
: Object.class;
this.elementJavaType = signatureType != null
elementJavaType = signatureType != null
? getClassFromGenericArgument( signatureType.getActualTypeArguments()[1] )
: Object.class;
@ -65,75 +65,63 @@ class PluralAttributeMetadataImpl<X, Y, E>
}
case ARRAY:
case LIST: {
this.keyJavaType = Integer.class;
keyJavaType = Integer.class;
this.elementJavaType = signatureType != null
elementJavaType = signatureType != null
? getClassFromGenericArgument( signatureType.getActualTypeArguments()[0] )
: Object.class;
break;
}
default: {
this.elementJavaType = signatureType != null
elementJavaType = signatureType != null
? getClassFromGenericArgument( signatureType.getActualTypeArguments()[0] )
: Object.class;
this.keyJavaType = null;
keyJavaType = null;
}
}
this.elementValueContext = new ValueContext() {
elementValueContext = new ValueContext() {
@Override
public Value getHibernateValue() {
return ( (Collection) getPropertyMapping().getValue() ).getElement();
}
@Override
public Class<?> getJpaBindableType() {
return elementJavaType;
}
@Override
public ValueClassification getValueClassification() {
switch ( PluralAttributeMetadataImpl.this.elementClassification ) {
case EMBEDDED: {
return ValueClassification.EMBEDDABLE;
}
case BASIC: {
return ValueClassification.BASIC;
}
default: {
return ValueClassification.ENTITY;
}
}
return toValueClassification(PluralAttributeMetadataImpl.this.elementClassification);
}
@Override
public AttributeMetadata<X,Y> getAttributeMetadata() {
return PluralAttributeMetadataImpl.this;
}
};
// interpret the key, if one
if ( this.listIndexOrMapKeyClassification != null ) {
this.keyValueContext = new ValueContext() {
if ( listIndexOrMapKeyClassification != null ) {
keyValueContext = new ValueContext() {
@Override
public Value getHibernateValue() {
return ( (Map) getPropertyMapping().getValue() ).getIndex();
}
@Override
public Class<?> getJpaBindableType() {
return keyJavaType;
}
@Override
public ValueClassification getValueClassification() {
switch ( PluralAttributeMetadataImpl.this.listIndexOrMapKeyClassification ) {
case EMBEDDED: {
return ValueClassification.EMBEDDABLE;
}
case BASIC: {
return ValueClassification.BASIC;
}
default: {
return ValueClassification.ENTITY;
}
}
return toValueClassification(PluralAttributeMetadataImpl.this.listIndexOrMapKeyClassification);
}
@Override
public AttributeMetadata<X,Y> getAttributeMetadata() {
return PluralAttributeMetadataImpl.this;
}
@ -144,6 +132,17 @@ class PluralAttributeMetadataImpl<X, Y, E>
}
}
private static ValueClassification toValueClassification(AttributeClassification classification) {
switch ( classification ) {
case EMBEDDED:
return ValueClassification.EMBEDDABLE;
case BASIC:
return ValueClassification.BASIC;
default:
return ValueClassification.ENTITY;
}
}
private Class<?> getClassFromGenericArgument(java.lang.reflect.Type type) {
if ( type instanceof Class ) {
return (Class<?>) type;
@ -211,6 +210,7 @@ class PluralAttributeMetadataImpl<X, Y, E>
}
}
@Override
public ValueContext getElementValueContext() {
return elementValueContext;
}
@ -220,6 +220,7 @@ class PluralAttributeMetadataImpl<X, Y, E>
return collectionClassification;
}
@Override
public ValueContext getMapKeyValueContext() {
return keyValueContext;
}

5
hibernate-core/src/main/java/org/hibernate/metamodel/internal/SingularAttributeMetadataImpl.java
View File

@ -29,14 +29,17 @@ public class SingularAttributeMetadataImpl<X, Y> extends BaseAttributeMetadata<X
MetadataContext metadataContext) {
super( propertyMapping, ownerType, member, attributeClassification, metadataContext );
valueContext = new ValueContext() {
@Override
public Value getHibernateValue() {
return getPropertyMapping().getValue();
}
@Override
public Class<Y> getJpaBindableType() {
return getAttributeMetadata().getJavaType();
}
@Override
public ValueClassification getValueClassification() {
switch ( attributeClassification ) {
case EMBEDDED: {
@ -51,12 +54,14 @@ public class SingularAttributeMetadataImpl<X, Y> extends BaseAttributeMetadata<X
}
}
@Override
public AttributeMetadata<X,Y> getAttributeMetadata() {
return SingularAttributeMetadataImpl.this;
}
};
}
@Override
public ValueContext getValueContext() {
return valueContext;
}