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

HHH-12338 - Incorrect metamodel for basic collections

This commit is contained in:
Vlad Mihalcea 2020-02-21 10:11:12 +02:00 committed by Christian Beikov
parent d201b0b22d
commit e7bf1b76b8
2 changed files with 106 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/MetaAttributeGenerationVisitor.java
View File

@ -138,6 +138,23 @@ public class MetaAttributeGenerationVisitor extends SimpleTypeVisitor6<Annotatio
accessTypeInfo.setDefaultAccessType( entity.getEntityAccessTypeInfo().getAccessType() );
}
}
if ( TypeUtils.containsAnnotation(
element,
Constants.BASIC,
Constants.CONVERT,
Constants.HIBERNATE_TYPE
) && !TypeUtils.containsAnnotation(
element,
Constants.ONE_TO_MANY,
Constants.MANY_TO_MANY,
Constants.ELEMENT_COLLECTION
) ) {
return new AnnotationMetaSingleAttribute(
entity,
element,
TypeUtils.toTypeString( declaredType )
);
}
if ( collection.equals( Constants.MAP_ATTRIBUTE ) ) {
return createAnnotationMetaAttributeForMap( declaredType, element, collection, targetEntity );
}

89
tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/CollectionAsBasicTypeTest.java Normal file
View File

@ -0,0 +1,89 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.jpamodelgen.test.collectionbasictype;
import org.hibernate.jpamodelgen.test.util.CompilationTest;
import org.hibernate.jpamodelgen.test.util.TestForIssue;
import org.hibernate.jpamodelgen.test.util.WithClasses;
import org.junit.Test;
import static org.hibernate.jpamodelgen.test.util.TestUtil.assertAttributeTypeInMetaModelFor;
import static org.hibernate.jpamodelgen.test.util.TestUtil.assertListAttributeTypeInMetaModelFor;
import static org.hibernate.jpamodelgen.test.util.TestUtil.assertMetamodelClassGeneratedFor;
/**
* @author helloztt
*/
public class CollectionAsBasicTypeTest extends CompilationTest {
@Test
@TestForIssue(jiraKey = "HHH-12338")
@WithClasses({Goods.class, Product.class})
public void testConvert() throws ClassNotFoundException, NoSuchFieldException {
assertMetamodelClassGeneratedFor(Product.class);
assertMetamodelClassGeneratedFor(Goods.class);
assertListAttributeTypeInMetaModelFor(
Goods.class,
"productList",
Product.class,
"ListAttribute generic type should be Product"
);
assertAttributeTypeInMetaModelFor(
Goods.class,
"tags",
Goods.class.getDeclaredField("tags").getGenericType(),
"Wrong meta model type"
);
}
@Test
@TestForIssue(jiraKey = "HHH-12338")
@WithClasses({Person.class})
public void testListType() throws ClassNotFoundException, NoSuchFieldException {
assertMetamodelClassGeneratedFor(Person.class);
assertAttributeTypeInMetaModelFor(
Person.class,
"phones",
Person.class.getDeclaredField("phones").getGenericType(),
"Wrong meta model type"
);
}
@Test
@TestForIssue(jiraKey = "HHH-12338")
@WithClasses({PersonPhone.class})
public void testListTypeWithImport() throws ClassNotFoundException, NoSuchFieldException {
assertMetamodelClassGeneratedFor(PersonPhone.class);
assertAttributeTypeInMetaModelFor(
PersonPhone.class,
"phones",
PersonPhone.class.getDeclaredField("phones").getGenericType(),
"Wrong meta model type"
);
}
@Test
@TestForIssue(jiraKey = "HHH-12338")
@WithClasses({PhoneBook.class})
public void testMapType() throws ClassNotFoundException, NoSuchFieldException {
assertMetamodelClassGeneratedFor(PhoneBook.class);
assertAttributeTypeInMetaModelFor(
PhoneBook.class,
"phones",
PhoneBook.class.getDeclaredField("phones").getGenericType(),
"Wrong meta model type"
);
}
}