Remove few NotYetImplementedFor6Exception

hibernate · Dec 23, 2021 · 67f73f2 · 67f73f2
1 parent 87c059a
commit 67f73f2
Show file tree

Hide file tree

Showing 32 changed files with 270 additions and 114 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java
@@ -18,7 +18,6 @@
 import org.hibernate.AssertionFailure;
 import org.hibernate.CacheMode;
 import org.hibernate.FlushMode;
-import org.hibernate.NotYetImplementedFor6Exception;
 import org.hibernate.annotations.CacheModeType;
 import org.hibernate.annotations.FlushModeType;
 import org.hibernate.annotations.QueryHints;

diff --git a/hibernate-core/src/main/java/org/hibernate/id/SelectGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/SelectGenerator.java
@@ -13,7 +13,6 @@
 
 import org.hibernate.HibernateException;
 import org.hibernate.MappingException;
-import org.hibernate.NotYetImplementedFor6Exception;
 import org.hibernate.boot.model.relational.SqlStringGenerationContext;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;

diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/EmbeddableInstantiator.java b/hibernate-core/src/main/java/org/hibernate/metamodel/EmbeddableInstantiator.java
@@ -28,7 +28,4 @@ public interface EmbeddableInstantiator extends Instantiator {
 	 */
 	Object instantiate(Supplier<Object[]> valuesAccess, SessionFactoryImplementor sessionFactory);
 
-//	default Object instantiate(IntFunction<Object> valueAccess, SessionFactoryImplementor sessionFactory) {
-//		throw new NotYetImplementedFor6Exception( getClass() );
-//	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/RuntimeMetamodels.java b/hibernate-core/src/main/java/org/hibernate/metamodel/RuntimeMetamodels.java
@@ -7,7 +7,6 @@
 package org.hibernate.metamodel;
 
 import org.hibernate.Incubating;
-import org.hibernate.NotYetImplementedFor6Exception;
 import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
@@ -46,10 +45,8 @@ default PluralAttributeMapping getPluralAttributeMapping(String role) {
 		return getMappingMetamodel().findCollectionDescriptor( role ).getAttributeMapping();
 	}
 
-	default EmbeddableValuedModelPart getEmbedded(String role) {
-		// todo (6.0) : I think we might need a form of mapping-model look-up for embeddables, something like:
-		throw new NotYetImplementedFor6Exception( getClass() );
-	}
+	// todo (6.0) : I think we might need a form of mapping-model look-up for embeddables, something like:
+	EmbeddableValuedModelPart getEmbedded(String role);
 
 	default String getImportedName(String name) {
 		return getMappingMetamodel().getImportedName( name );

diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/RuntimeMetamodelsImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/RuntimeMetamodelsImpl.java
@@ -6,11 +6,13 @@
  */
 package org.hibernate.metamodel.internal;
 
+import org.hibernate.NotYetImplementedFor6Exception;
 import org.hibernate.boot.spi.BootstrapContext;
 import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.internal.SessionFactoryImpl;
 import org.hibernate.metamodel.MappingMetamodel;
 import org.hibernate.metamodel.RuntimeMetamodels;
+import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
 import org.hibernate.metamodel.model.domain.JpaMetamodel;
 import org.hibernate.metamodel.model.domain.internal.MappingMetamodelImpl;
 
@@ -34,6 +36,11 @@ public MappingMetamodel getMappingMetamodel() {
 		return mappingMetamodel;
 	}
 
+	@Override
+	public EmbeddableValuedModelPart getEmbedded(String role) {
+		throw new NotYetImplementedFor6Exception( getClass() );
+	}
+
 	/**
 	 * Chicken-and-egg because things try to use the SessionFactory (specifically the MappingMetamodel)
 	 * before it is ready.  So we do this fugly code...

diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableMappingType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableMappingType.java
@@ -9,22 +9,6 @@
 import java.util.List;
 import java.util.function.BiConsumer;
 
-import org.hibernate.MappingException;
-import org.hibernate.NotYetImplementedFor6Exception;
-import org.hibernate.SharedSessionContract;
-import org.hibernate.boot.model.relational.SqlStringGenerationContext;
-import org.hibernate.cfg.Environment;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.engine.FetchTiming;
-import org.hibernate.engine.config.spi.ConfigurationService;
-import org.hibernate.engine.spi.CascadeStyle;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.internal.util.config.ConfigurationHelper;
-import org.hibernate.mapping.Any;
-import org.hibernate.mapping.BasicValue;
-import org.hibernate.mapping.Column;
-import org.hibernate.mapping.Component;
 import org.hibernate.mapping.IndexedConsumer;
 import org.hibernate.metamodel.mapping.internal.EmbeddedAttributeMapping;
 import org.hibernate.metamodel.mapping.internal.MappingModelCreationProcess;

diff --git a/...ore/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java b/...ore/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java
@@ -17,7 +17,6 @@
 import org.hibernate.MappingException;
 import org.hibernate.NotYetImplementedFor6Exception;
 import org.hibernate.SharedSessionContract;
-import org.hibernate.boot.model.relational.SqlStringGenerationContext;
 import org.hibernate.cfg.Environment;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.FetchTiming;
@@ -35,7 +34,6 @@
 import org.hibernate.mapping.IndexedConsumer;
 import org.hibernate.mapping.Property;
 import org.hibernate.mapping.Selectable;
-import org.hibernate.mapping.Table;
 import org.hibernate.metamodel.UnsupportedMappingException;
 import org.hibernate.metamodel.mapping.AttributeMapping;
 import org.hibernate.metamodel.mapping.EmbeddableMappingType;

diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/IdClassEmbeddable.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/IdClassEmbeddable.java
@@ -10,7 +10,6 @@
 import java.util.function.Consumer;
 
 import org.hibernate.NotYetImplementedFor6Exception;
-import org.hibernate.boot.model.relational.SqlStringGenerationContext;
 import org.hibernate.engine.FetchStyle;
 import org.hibernate.engine.FetchTiming;
 import org.hibernate.engine.spi.EntityKey;
@@ -20,7 +19,6 @@
 import org.hibernate.mapping.Component;
 import org.hibernate.mapping.IndexedConsumer;
 import org.hibernate.mapping.RootClass;
-import org.hibernate.mapping.Table;
 import org.hibernate.metamodel.mapping.AttributeMapping;
 import org.hibernate.metamodel.mapping.EmbeddableMappingType;
 import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
@@ -398,6 +396,16 @@ public Object disassemble(Object value, SharedSessionContractImplementor session
 		return result;
 	}
 
+	@Override
+	public int forEachDisassembledJdbcValue(
+			Object value,
+			Clause clause,
+			int offset,
+			JdbcValuesConsumer valuesConsumer,
+			SharedSessionContractImplementor session) {
+		throw new NotYetImplementedFor6Exception( getClass() );
+	}
+
 	@Override
 	public int forEachJdbcType(int offset, IndexedConsumer<JdbcMapping> action) {
 		return selectableMappings.forEachSelectable(

diff --git a/...nate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualIdEmbeddable.java b/...nate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualIdEmbeddable.java
@@ -10,11 +10,9 @@
 import java.util.function.Consumer;
 
 import org.hibernate.NotYetImplementedFor6Exception;
-import org.hibernate.boot.model.relational.SqlStringGenerationContext;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.mapping.Component;
 import org.hibernate.mapping.IndexedConsumer;
-import org.hibernate.mapping.Table;
 import org.hibernate.metamodel.mapping.AttributeMapping;
 import org.hibernate.metamodel.mapping.EmbeddableMappingType;
 import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;

diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EmbeddableDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EmbeddableDomainType.java
@@ -19,5 +19,4 @@
  * @author Steve Ebersole
  */
 public interface EmbeddableDomainType<J> extends ManagedDomainType<J>, EmbeddableType<J>, AllowableParameterType<J> {
-	ManagedTypeRepresentationStrategy getRepresentationStrategy();
 }
diff --git a/...nate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ArrayTupleType.java b/...nate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ArrayTupleType.java
@@ -11,7 +11,9 @@
 
 import org.hibernate.NotYetImplementedFor6Exception;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.mapping.IndexedConsumer;
 import org.hibernate.metamodel.UnsupportedMappingException;
+import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.metamodel.mapping.MappingModelExpressable;
 import org.hibernate.metamodel.model.domain.AllowableFunctionReturnType;
 import org.hibernate.metamodel.model.domain.AllowableParameterType;

diff --git a/...-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddableTypeImpl.java b/...-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddableTypeImpl.java
@@ -10,6 +10,7 @@
 
 import org.hibernate.graph.internal.SubGraphImpl;
 import org.hibernate.graph.spi.SubGraphImplementor;
+import org.hibernate.metamodel.ManagedTypeRepresentationStrategy;
 import org.hibernate.metamodel.model.domain.AbstractManagedType;
 import org.hibernate.metamodel.model.domain.EmbeddableDomainType;
 import org.hibernate.metamodel.model.domain.JpaMetamodel;

diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java
@@ -156,10 +156,7 @@ default String getSqlAliasStem() {
 	 */
 	SqmMultiTableMutationStrategy getSqmMultiTableMutationStrategy();
 
-	default SqmMultiTableInsertStrategy getSqmMultiTableInsertStrategy() {
-		throw new NotYetImplementedFor6Exception( getClass() );
-	}
-
+	SqmMultiTableInsertStrategy getSqmMultiTableInsertStrategy();
 	/**
 	 * Retrieve the underlying entity metamodel instance...
 	 *

diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/PropertyMapping.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/PropertyMapping.java
@@ -6,7 +6,6 @@
  */
 package org.hibernate.persister.entity;
 
-import org.hibernate.NotYetImplementedFor6Exception;
 import org.hibernate.QueryException;
 import org.hibernate.type.Type;
 
@@ -44,9 +43,7 @@ public interface PropertyMapping {
 	 * todo (6.0) : define an exception in the signature for cases where the PropertyMapping
 	 * cannot be de-referenced (basic values)
 	 */
-	default PropertyMapping resolveSubMapping(String name) {
-		throw new NotYetImplementedFor6Exception();
-	}
+	//	PropertyMapping resolveSubMapping(String name);
 
 	// todo (6.0) : add capability to create SqmPath, i.e.
 	// SqmPath createSqmPath(SqmPath<?> lhs, SqmCreationState creationState);
@@ -61,10 +58,10 @@ default PropertyMapping resolveSubMapping(String name) {
 	/**
 	 * Given a component path expression, get the type of the property
 	 */
-	public Type toType(String propertyName) throws QueryException;
+	Type toType(String propertyName) throws QueryException;
 
 	/**
 	 * Given a property path, return the corresponding column name(s).
 	 */
-	public String[] toColumns(String propertyName) throws QueryException, UnsupportedOperationException;
+	String[] toColumns(String propertyName) throws QueryException, UnsupportedOperationException;
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/QuerySplitter.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/QuerySplitter.java
@@ -25,7 +25,6 @@
 import org.hibernate.query.sqm.spi.BaseSemanticQueryWalker;
 import org.hibernate.query.sqm.spi.SqmCreationContext;
 import org.hibernate.query.sqm.tree.SqmDeleteOrUpdateStatement;
-import org.hibernate.query.sqm.tree.SqmQuery;
 import org.hibernate.query.sqm.tree.cte.SqmCteContainer;
 import org.hibernate.query.sqm.tree.cte.SqmCteStatement;
 import org.hibernate.query.sqm.tree.delete.SqmDeleteStatement;
@@ -790,17 +789,6 @@ public SqmCreationOptions getCreationOptions() {
 			return () -> false;
 		}
 
-//		@Override
-//		public String generateUniqueIdentifier() {
-//			// todo (6.0) : not sure these are needed
-//			throw new NotYetImplementedFor6Exception(  );
-//		}
-//
-//		@Override
-//		public ImplicitAliasGenerator getImplicitAliasGenerator() {
-//			// todo (6.0) : not sure these are needed
-//			throw new NotYetImplementedFor6Exception(  );
-//		}
 	}
 
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/ResultsHelper.java b/hibernate-core/src/main/java/org/hibernate/query/results/ResultsHelper.java
@@ -6,36 +6,15 @@
  */
 package org.hibernate.query.results;
 
-import org.hibernate.NotYetImplementedFor6Exception;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.metamodel.mapping.AttributeMapping;
-import org.hibernate.metamodel.mapping.BasicValuedModelPart;
-import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
 import org.hibernate.metamodel.mapping.EntityIdentifierMapping;
-import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.ModelPart;
 import org.hibernate.metamodel.mapping.internal.SingleAttributeIdentifierMapping;
 import org.hibernate.query.EntityIdentifierNavigablePath;
-import org.hibernate.query.NavigablePath;
-import org.hibernate.query.internal.ImplicitAttributeFetchMemento;
-import org.hibernate.query.internal.ImplicitModelPartResultMemento;
-import org.hibernate.query.internal.ResultSetMappingResolutionContext;
-import org.hibernate.query.named.FetchMemento;
-import org.hibernate.query.named.ModelPartResultMemento;
-import org.hibernate.query.named.ResultMemento;
-import org.hibernate.query.results.implicit.ImplicitFetchBuilder;
-import org.hibernate.query.results.implicit.ImplicitFetchBuilderBasic;
-import org.hibernate.query.results.implicit.ImplicitFetchBuilderEmbeddable;
-import org.hibernate.query.results.implicit.ImplicitModelPartResultBuilderEntity;
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.Fetch;
-import org.hibernate.sql.results.graph.FetchParent;
-import org.hibernate.sql.results.graph.Fetchable;
 import org.hibernate.sql.results.graph.basic.BasicFetch;
-import org.hibernate.sql.results.graph.embeddable.EmbeddableValuedFetchable;
-import org.hibernate.sql.results.graph.entity.EntityValuedFetchable;
 
 /**
  * @author Steve Ebersole

diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/SemanticQueryWalker.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/SemanticQueryWalker.java
@@ -8,7 +8,6 @@
 
 import java.util.List;
 
-import org.hibernate.NotYetImplementedFor6Exception;
 import org.hibernate.query.sqm.sql.internal.SelfInterpretingSqmPath;
 import org.hibernate.query.sqm.tree.cte.SqmCteContainer;
 import org.hibernate.query.sqm.tree.cte.SqmCteStatement;

diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmMappingModelHelper.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmMappingModelHelper.java
@@ -9,7 +9,6 @@
 import java.util.function.Function;
 import jakarta.persistence.metamodel.Bindable;
 
-import org.hibernate.NotYetImplementedFor6Exception;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.metamodel.mapping.CollectionPart;
 import org.hibernate.metamodel.mapping.EntityMappingType;

diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java
@@ -3453,6 +3453,11 @@ public DomainResult<Map.Entry<Object, Object>> createDomainResult(
 						.resolveDescriptor( Map.Entry.class );
 				return new SqmMapEntryResult<>( indexResult, valueResult, resultVariable, mapEntryDescriptor );
 			}
+
+			@Override
+			public void applySqlSelections(DomainResultCreationState creationState) {
+				throw new NotYetImplementedFor6Exception( getClass() );
+			}
 		};
 	}
 

diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPluralPartJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPluralPartJoin.java
@@ -8,6 +8,7 @@
 
 import java.util.Locale;
 
+import org.hibernate.NotYetImplementedFor6Exception;
 import org.hibernate.metamodel.model.domain.EntityDomainType;
 import org.hibernate.query.NavigablePath;
 import org.hibernate.query.sqm.NodeBuilder;
@@ -19,6 +20,8 @@
 import org.hibernate.query.sqm.tree.from.SqmFrom;
 import org.hibernate.query.sqm.tree.from.SqmQualifiedJoin;
 import org.hibernate.query.sqm.tree.predicate.SqmPredicate;
+import org.hibernate.sql.results.graph.DomainResult;
+import org.hibernate.sql.results.graph.DomainResultCreationState;
 
 /**
  * @author Christian Beikov
@@ -111,4 +114,15 @@ public String toString() {
 				getReferencedPathSource().getPathName()
 		);
 	}
+
+	@Override
+	public DomainResult<T> createDomainResult(
+			String resultVariable, DomainResultCreationState creationState) {
+		throw new NotYetImplementedFor6Exception( getClass() );
+	}
+
+	@Override
+	public void applySqlSelections(DomainResultCreationState creationState) {
+		throw new NotYetImplementedFor6Exception( getClass() );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSingularJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSingularJoin.java
@@ -13,6 +13,7 @@
 import org.hibernate.query.NavigablePath;
 import org.hibernate.query.hql.spi.SqmCreationProcessingState;
 import org.hibernate.query.sqm.NodeBuilder;
+import org.hibernate.query.sqm.SqmJoinable;
 import org.hibernate.query.sqm.tree.SqmJoinType;
 import org.hibernate.query.sqm.tree.from.SqmAttributeJoin;
 import org.hibernate.query.sqm.tree.from.SqmFrom;

diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/UnaryOperation.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/UnaryOperation.java
@@ -7,7 +7,6 @@
 
 package org.hibernate.sql.ast.tree.expression;
 
-import org.hibernate.NotYetImplementedFor6Exception;
 import org.hibernate.metamodel.mapping.BasicValuedMapping;
 import org.hibernate.metamodel.mapping.MappingModelExpressable;
 import org.hibernate.query.UnaryArithmeticOperator;

diff --git a/...n/java/org/hibernate/sql/results/graph/entity/internal/EntityDelayedFetchInitializer.java b/...n/java/org/hibernate/sql/results/graph/entity/internal/EntityDelayedFetchInitializer.java
@@ -8,7 +8,6 @@
 
 import java.util.function.Consumer;
 
-import org.hibernate.NotYetImplementedFor6Exception;
 import org.hibernate.bytecode.enhance.spi.LazyPropertyInitializer;
 import org.hibernate.engine.spi.EntityKey;
 import org.hibernate.engine.spi.EntityUniqueKey;
@@ -213,12 +212,12 @@ public Object getEntityInstance() {
 
 	@Override
 	public EntityKey getEntityKey() {
-		throw new NotYetImplementedFor6Exception( getClass() );
+		throw new UnsupportedOperationException();
 	}
 
 	@Override
 	public Object getParentKey() {
-		throw new NotYetImplementedFor6Exception( getClass() );
+		throw new UnsupportedOperationException();
 	}
 
 	@Override