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

import entity graph parsing test cases

This commit is contained in:
Nathan Xu 2020-06-11 00:13:44 -04:00 committed by Steve Ebersole
parent 06605956f9
commit 233b8daffb
11 changed files with 51 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
documentation/src/test/java/org/hibernate/userguide/fetching/GraphParsingTest.java
View File

@ -16,7 +16,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.TypedQuery;
import org.hibernate.dialect.H2Dialect;
import org.hibernate.graph.AbstractEntityGraphTest;
import org.hibernate.orm.test.loading.entitygraph.parser.AbstractEntityGraphTest;
import org.hibernate.graph.GraphParser;
import org.hibernate.graph.EntityGraphs;
import org.hibernate.graph.GraphSemantic;

23
hibernate-core/src/main/antlr/org/hibernate/grammars/graph/GraphLanguageLexer.g4
View File

@ -39,17 +39,30 @@ RPAREN: ')';
/**
* In this grammar, basically any string since we (atm) have no keywords
*/
NAME : NAME_START ( NAME_CONTINUATION )*;
ATTR_NAME : ATTR_NAME_START NAME_CONTINUATION*;
fragment NAME_START
: '_'
TYPE_NAME : TYPE_NAME_START NAME_CONTINUATION*;
fragment NON_ALPHANUM_EXTENTION
: '_'
| '$'
| 'a'..'z'
// HHH-558 : Allow unicode chars in identifiers
//| '\u0080'..'\ufffe'
;
fragment ATTR_NAME_START
: NON_ALPHANUM_EXTENTION
| 'a'..'z'
;
fragment TYPE_NAME_START
: NON_ALPHANUM_EXTENTION
| 'A'..'Z'
;
fragment NAME_CONTINUATION
: NAME_START
: NON_ALPHANUM_EXTENTION
| 'a'..'z'
| 'A'..'Z'
| '0'..'9'
;

8
hibernate-core/src/main/antlr/org/hibernate/grammars/graph/GraphLanguageParser.g4
View File

@ -33,15 +33,15 @@ attributeList
;
attributeNode
: attributePath (subGraph)?
: attributePath subGraph?
;
attributePath
: NAME attributeQualifier?
: ATTR_NAME attributeQualifier?
;
attributeQualifier
: DOT NAME
: DOT ATTR_NAME
;
subGraph
@ -49,5 +49,5 @@ subGraph
;
subType
: NAME
: TYPE_NAME
;

4
hibernate-core/src/main/java/org/hibernate/graph/internal/parse/GraphParser.java
View File

@ -77,7 +77,7 @@ public class GraphParser extends GraphLanguageParserBaseVisitor {
@Override
public AttributeNodeImplementor visitAttributeNode(GraphLanguageParser.AttributeNodeContext ctx) {
final String attributeName = ctx.attributePath().NAME().getText();
final String attributeName = ctx.attributePath().ATTR_NAME().getText();
final SubGraphGenerator subGraphCreator;
@ -93,7 +93,7 @@ public class GraphParser extends GraphLanguageParserBaseVisitor {
subGraphCreator = PathQualifierType.VALUE.getSubGraphCreator();
}
else {
final String qualifierName = ctx.attributePath().attributeQualifier().NAME().getText();
final String qualifierName = ctx.attributePath().attributeQualifier().ATTR_NAME().getText();
if ( PARSING_LOGGER.isDebugEnabled() ) {
PARSING_LOGGER.debugf(

8
hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractManagedType.java
View File

@ -117,7 +117,7 @@ public abstract class AbstractManagedType<J>
@SuppressWarnings("unchecked")
public PersistentAttribute<? super J,?> getAttribute(String name) {
final PersistentAttribute attribute = findAttribute( name );
checkNotNull( "Attribute ", attribute, name );
checkNotNull( "Attribute", attribute, name );
return attribute;
}
@ -164,7 +164,7 @@ public abstract class AbstractManagedType<J>
@SuppressWarnings("unchecked")
public PersistentAttribute<J,?> getDeclaredAttribute(String name) {
PersistentAttribute attr = findDeclaredAttribute( name );
checkNotNull( "Attribute ", attr, name );
checkNotNull( "Attribute", attr, name );
return attr;
}
@ -209,7 +209,7 @@ public abstract class AbstractManagedType<J>
@SuppressWarnings("unchecked")
public SingularPersistentAttribute<? super J, ?> getSingularAttribute(String name) {
SingularPersistentAttribute attribute = findSingularAttribute( name );
checkNotNull( "SingularAttribute ", attribute, name );
checkNotNull( "SingularAttribute", attribute, name );
return attribute;
}
@ -235,7 +235,7 @@ public abstract class AbstractManagedType<J>
@SuppressWarnings("unchecked")
public SingularAttribute<J, ?> getDeclaredSingularAttribute(String name) {
final SingularAttribute attr = findDeclaredSingularAttribute( name );
checkNotNull( "SingularAttribute ", attr, name );
checkNotNull( "SingularAttribute", attr, name );
return attr;
}

2
hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/DomainModelHelper.java
View File

@ -29,7 +29,7 @@ public class DomainModelHelper {
}
// first, try to find it by name directly..
ManagedDomainType<S> subManagedType = jpaMetamodel.entity( subTypeName );
ManagedDomainType<S> subManagedType = jpaMetamodel.resolveHqlEntityReference( subTypeName );
if ( subManagedType != null ) {
return subManagedType;
}

7
hibernate-core/src/test/java/org/hibernate/graph/AbstractEntityGraphTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/loading/entitygraph/parser/AbstractEntityGraphTest.java
View File

@ -4,17 +4,17 @@
* 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.graph;
package org.hibernate.orm.test.loading.entitygraph.parser;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import javax.persistence.AttributeNode;
import javax.persistence.EntityGraph;
import javax.persistence.EntityManager;
import javax.persistence.Subgraph;
import org.hibernate.graph.GraphParser;
import org.hibernate.graph.spi.RootGraphImplementor;
import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
@ -28,7 +28,7 @@ public abstract class AbstractEntityGraphTest extends BaseEntityManagerFunctiona
@Override
protected Class<?>[] getAnnotatedClasses() {
return new Class[]{ GraphParsingTestEntity.class, GraphParsingTestSubentity.class };
return new Class[]{ GraphParsingTestEntity.class, GraphParsingTestSubEntity.class };
}
protected <T> RootGraphImplementor<T> parseGraph(Class<T> entityType, String graphString) {
@ -104,3 +104,4 @@ public abstract class AbstractEntityGraphTest extends BaseEntityManagerFunctiona
}
}

13
hibernate-core/src/test/java/org/hibernate/graph/EntityGraphParserTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/loading/entitygraph/parser/EntityGraphParserTest.java
View File

@ -4,7 +4,7 @@
* 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.graph;
package org.hibernate.orm.test.loading.entitygraph.parser;
import java.util.List;
import java.util.Map;
@ -15,6 +15,7 @@ import javax.persistence.EntityManager;
import javax.persistence.Subgraph;
import org.hibernate.engine.spi.SessionImplementor;
import org.hibernate.graph.GraphParser;
import org.hibernate.graph.spi.AttributeNodeImplementor;
import org.hibernate.graph.spi.RootGraphImplementor;
import org.hibernate.graph.spi.SubGraphImplementor;
@ -191,7 +192,7 @@ public class EntityGraphParserTest extends AbstractEntityGraphTest {
//
// return type.isAssignableFrom( entityPersister.getMappedClass() );
RootGraphImplementor<GraphParsingTestEntity> graph = parseGraph( "linkToOne(name, description), linkToOne(GraphParsingTestSubentity: sub)" );
RootGraphImplementor<GraphParsingTestEntity> graph = parseGraph( "linkToOne(name, description), linkToOne(GraphParsingTestSubEntity: sub)" );
assertNotNull( graph );
List<AttributeNodeImplementor<?>> attrs = graph.getAttributeNodeImplementors();
@ -204,7 +205,7 @@ public class EntityGraphParserTest extends AbstractEntityGraphTest {
assertNullOrEmpty( linkToOneNode.getKeySubgraphs() );
final SubGraphImplementor subGraph = linkToOneNode.getSubGraphMap().get( GraphParsingTestSubentity.class );
final SubGraphImplementor subGraph = linkToOneNode.getSubGraphMap().get( GraphParsingTestSubEntity.class );
assertNotNull( subGraph );
assertBasicAttributes( subGraph, "sub" );
@ -215,12 +216,12 @@ public class EntityGraphParserTest extends AbstractEntityGraphTest {
EntityManager entityManager = getOrCreateEntityManager();
RootGraphImplementor<GraphParsingTestEntity> graph = ( (SessionImplementor) entityManager ).createEntityGraph(
GraphParsingTestEntity.class );
final SubGraphImplementor<GraphParsingTestSubentity> subGraph = graph.addSubGraph(
final SubGraphImplementor<GraphParsingTestSubEntity> subGraph = graph.addSubGraph(
"linkToOne",
GraphParsingTestSubentity.class
GraphParsingTestSubEntity.class
);
assertEquals( subGraph.getGraphedType().getJavaType(), GraphParsingTestSubentity.class );
assertEquals( subGraph.getGraphedType().getJavaType(), GraphParsingTestSubEntity.class );
final AttributeNodeImplementor<Object> subTypeAttrNode = subGraph.addAttributeNode( "sub" );
assert subTypeAttrNode != null;

4
hibernate-core/src/test/java/org/hibernate/graph/EntityGraphsTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/loading/entitygraph/parser/EntityGraphsTest.java
View File

@ -4,11 +4,13 @@
* 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.graph;
package org.hibernate.orm.test.loading.entitygraph.parser;
import javax.persistence.EntityGraph;
import javax.persistence.EntityManager;
import org.hibernate.graph.EntityGraphs;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;

7
hibernate-core/src/test/java/org/hibernate/graph/GraphParsingTestEntity.java → hibernate-core/src/test/java/org/hibernate/orm/test/loading/entitygraph/parser/GraphParsingTestEntity.java
View File

@ -1,7 +1,6 @@
package org.hibernate.graph;
package org.hibernate.orm.test.loading.entitygraph.parser;
import java.util.Map;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.ElementCollection;
@ -11,7 +10,7 @@ import javax.persistence.Id;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
@Entity
@Entity( name = "GraphParsingTestEntity" )
public class GraphParsingTestEntity {
private String id;
@ -79,4 +78,4 @@ public class GraphParsingTestEntity {
public void setDescription(String description) {
this.description = description;
}
}
}

8
hibernate-core/src/test/java/org/hibernate/graph/GraphParsingTestSubentity.java → hibernate-core/src/test/java/org/hibernate/orm/test/loading/entitygraph/parser/GraphParsingTestSubEntity.java
View File

@ -1,10 +1,10 @@
package org.hibernate.graph;
package org.hibernate.orm.test.loading.entitygraph.parser;
import javax.persistence.Basic;
import javax.persistence.Entity;
@Entity
public class GraphParsingTestSubentity extends GraphParsingTestEntity {
@Entity( name = "GraphParsingTestSubEntity" )
public class GraphParsingTestSubEntity extends GraphParsingTestEntity {
private String sub;
@ -17,4 +17,4 @@ public class GraphParsingTestSubentity extends GraphParsingTestEntity {
this.sub = sub;
}
}
}