Skip to content

Commit 3fb67e1

Browse files
gavinkinggavinking
committed
HHH-19466 remove unimplemented/unused/unnecessary graph-related operations of MappingMetamodel
- most of these threw USO or returned null :-( - consolidate all this stuff onto JpaMetamodelImplementor
1 parent 95db146 commit 3fb67e1

File tree

5 files changed

+6
-82
lines changed

5 files changed

+6
-82
lines changed

‎hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -928,7 +928,7 @@ public <T> T unwrap(Class<T> type) {
928928

929929
@Override
930930
public <T> void addNamedEntityGraph(String graphName, EntityGraph<T> entityGraph) {
931-
getMappingMetamodel().addNamedEntityGraph( graphName, (RootGraphImplementor<T>) entityGraph );
931+
getJpaMetamodel().addNamedEntityGraph( graphName, (RootGraphImplementor<T>) entityGraph );
932932
}
933933

934934
@Override

‎hibernate-core/src/main/java/org/hibernate/metamodel/MappingMetamodel.java‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,14 @@
44
*/
55
package org.hibernate.metamodel;
66

7-
import java.util.List;
87
import java.util.function.Consumer;
98
import java.util.function.Function;
109
import java.util.stream.Stream;
1110

1211
import org.hibernate.Incubating;
1312
import org.hibernate.Internal;
14-
import org.hibernate.graph.RootGraph;
1513
import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
1614
import org.hibernate.metamodel.mapping.MappingModelExpressible;
17-
import org.hibernate.metamodel.model.domain.EntityDomainType;
1815
import org.hibernate.metamodel.model.domain.NavigableRole;
1916
import org.hibernate.persister.collection.CollectionPersister;
2017
import org.hibernate.persister.entity.EntityPersister;
@@ -164,22 +161,6 @@ public interface MappingMetamodel extends Metamodel {
164161
*/
165162
CollectionPersister findCollectionDescriptor(String role);
166163

167-
168-
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
169-
// JPA entity graphs
170-
171-
RootGraph<?> findNamedGraph(String name);
172-
void addNamedEntityGraph(String graphName, RootGraph<?> entityGraph);
173-
void forEachNamedGraph(Consumer<RootGraph<?>> action);
174-
RootGraph<?> defaultGraph(String entityName);
175-
RootGraph<?> defaultGraph(Class<?> entityJavaType);
176-
RootGraph<?> defaultGraph(EntityPersister entityDescriptor);
177-
RootGraph<?> defaultGraph(EntityDomainType<?> entityDomainType);
178-
179-
List<RootGraph<?>> findRootGraphsForType(Class<?> baseEntityJavaType);
180-
List<RootGraph<?>> findRootGraphsForType(String baseEntityName);
181-
List<RootGraph<?>> findRootGraphsForType(EntityPersister baseEntityDescriptor);
182-
183164
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
184165
// SQM model -> Mapping model
185166

‎hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
2828
import org.hibernate.boot.spi.MetadataImplementor;
2929
import org.hibernate.engine.spi.SessionFactoryImplementor;
30-
import org.hibernate.graph.RootGraph;
3130
import org.hibernate.graph.spi.RootGraphImplementor;
3231
import org.hibernate.internal.CoreLogging;
3332
import org.hibernate.internal.CoreMessageLogger;
@@ -355,8 +354,7 @@ public JavaType<?> getJavaConstantType(String className, String fieldName) {
355354
try {
356355
final Field referencedField = getJavaField( className, fieldName );
357356
if ( referencedField != null ) {
358-
return getTypeConfiguration()
359-
.getJavaTypeRegistry()
357+
return getTypeConfiguration().getJavaTypeRegistry()
360358
.getDescriptor( referencedField.getType() );
361359
}
362360
}
@@ -386,11 +384,11 @@ private Field getJavaField(String className, String fieldName) throws NoSuchFiel
386384
return null;
387385
}
388386

389-
public void addNamedEntityGraph(String graphName, RootGraph<?> entityGraph) {
390-
final RootGraphImplementor<?> rootGraph = (RootGraphImplementor<?>) entityGraph;
387+
@Override
388+
public void addNamedEntityGraph(String graphName, RootGraphImplementor<?> rootGraph) {
391389
final EntityGraph<?> old = entityGraphMap.put( graphName, rootGraph.makeImmutableCopy( graphName ) );
392390
if ( old != null ) {
393-
log.debugf( "EntityGraph being replaced on EntityManagerFactory for name %s", graphName );
391+
log.debugf( "EntityGraph named '%s' was replaced", graphName );
394392
}
395393
}
396394

‎hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java‎

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import java.io.Serializable;
88
import java.util.Arrays;
99
import java.util.HashSet;
10-
import java.util.List;
1110
import java.util.Locale;
1211
import java.util.Map;
1312
import java.util.Set;
@@ -22,7 +21,6 @@
2221
import org.hibernate.UnknownEntityTypeException;
2322
import org.hibernate.boot.spi.MetadataImplementor;
2423
import org.hibernate.cache.spi.CacheImplementor;
25-
import org.hibernate.graph.RootGraph;
2624
import org.hibernate.internal.CoreLogging;
2725
import org.hibernate.internal.CoreMessageLogger;
2826
import org.hibernate.internal.util.collections.ArrayHelper;
@@ -560,60 +558,6 @@ public CollectionPersister findCollectionDescriptor(String role) {
560558
return collectionPersisterMap.get( role );
561559
}
562560

563-
@Override
564-
public void addNamedEntityGraph(String graphName, RootGraph<?> entityGraph) {
565-
jpaMetamodel.addNamedEntityGraph( graphName, entityGraph );
566-
}
567-
568-
private RootGraph<?> findEntityGraphByName(String name) {
569-
return jpaMetamodel.findEntityGraphByName( name );
570-
}
571-
572-
@Override
573-
public RootGraph<?> findNamedGraph(String name) {
574-
return findEntityGraphByName( name );
575-
}
576-
577-
@Override
578-
public void forEachNamedGraph(Consumer<RootGraph<?>> action) {
579-
throw new UnsupportedOperationException();
580-
}
581-
582-
@Override
583-
public RootGraph<?> defaultGraph(String entityName) {
584-
throw new UnsupportedOperationException();
585-
}
586-
587-
@Override
588-
public RootGraph<?> defaultGraph(Class<?> entityJavaType) {
589-
throw new UnsupportedOperationException();
590-
}
591-
592-
@Override
593-
public RootGraph<?> defaultGraph(EntityPersister entityDescriptor) {
594-
throw new UnsupportedOperationException();
595-
}
596-
597-
@Override
598-
public RootGraph<?> defaultGraph(EntityDomainType<?> entityDomainType) {
599-
return null;
600-
}
601-
602-
@Override
603-
public List<RootGraph<?>> findRootGraphsForType(Class<?> baseEntityJavaType) {
604-
throw new UnsupportedOperationException();
605-
}
606-
607-
@Override
608-
public List<RootGraph<?>> findRootGraphsForType(String baseEntityName) {
609-
throw new UnsupportedOperationException();
610-
}
611-
612-
@Override
613-
public List<RootGraph<?>> findRootGraphsForType(EntityPersister baseEntityDescriptor) {
614-
return null;
615-
}
616-
617561
@Override
618562
public MappingModelExpressible<?> resolveMappingExpressible(
619563
SqmExpressible<?> sqmExpressible,

‎hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/spi/JpaMetamodelImplementor.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public interface JpaMetamodelImplementor extends JpaMetamodel {
2121
MappingMetamodel getMappingMetamodel();
2222

2323
RootGraphImplementor<?> findEntityGraphByName(String name);
24+
void addNamedEntityGraph(String graphName, RootGraphImplementor<?> rootGraph);
2425

2526
<T> List<EntityGraph<? super T>> findEntityGraphsByJavaType(Class<T> entityClass);
2627
<T> Map<String, EntityGraph<? extends T>> getNamedEntityGraphs(Class<T> entityClass);

0 commit comments

Comments
 (0)