Remove Bindable NotYetImplementedFor6Exception

hibernate · Dec 23, 2021 · ee11f9a · ee11f9a
1 parent c612669
commit ee11f9a
Show file tree

Hide file tree

Showing 11 changed files with 151 additions and 20 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Bindable.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Bindable.java
@@ -10,7 +10,6 @@
 import java.util.List;
 
 import org.hibernate.Incubating;
-import org.hibernate.NotYetImplementedFor6Exception;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.mapping.IndexedConsumer;
 import org.hibernate.sql.ast.Clause;
@@ -115,9 +114,7 @@ default int forEachJdbcType(IndexedConsumer<JdbcMapping> action) {
 	 * Note that the identifier is not part of this disassembled state.  Note also
 	 * how the embedded value results in a sub-array.
 	 */
-	default Object disassemble(Object value, SharedSessionContractImplementor session) {
-		throw new NotYetImplementedFor6Exception( getClass() );
-	}
+	Object disassemble(Object value, SharedSessionContractImplementor session);
 
 	/**
 	 * @asciidoc
@@ -143,14 +140,12 @@ default int forEachDisassembledJdbcValue(
 		return forEachDisassembledJdbcValue( value, clause, 0, valuesConsumer, session );
 	}
 
-	default int forEachDisassembledJdbcValue(
+	int forEachDisassembledJdbcValue(
 			Object value,
 			Clause clause,
 			int offset,
 			JdbcValuesConsumer valuesConsumer,
-			SharedSessionContractImplementor session) {
-		throw new NotYetImplementedFor6Exception( getClass() );
-	}
+			SharedSessionContractImplementor session);
 
 	/**
 	 * Visit each constituent JDBC value extracted from the entity instance itself.

diff --git a/...ate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyDiscriminatorPart.java b/...ate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyDiscriminatorPart.java
@@ -24,6 +24,7 @@
 import org.hibernate.metamodel.mapping.SelectableMapping;
 import org.hibernate.metamodel.model.domain.NavigableRole;
 import org.hibernate.query.NavigablePath;
+import org.hibernate.sql.ast.Clause;
 import org.hibernate.sql.ast.spi.FromClauseAccess;
 import org.hibernate.sql.ast.spi.SqlAstCreationState;
 import org.hibernate.sql.ast.spi.SqlExpressionResolver;
@@ -143,6 +144,16 @@ public Object disassemble(Object value, SharedSessionContractImplementor session
 		return discriminator;
 	}
 
+	@Override
+	public int forEachDisassembledJdbcValue(
+			Object value,
+			Clause clause,
+			int offset,
+			JdbcValuesConsumer valuesConsumer,
+			SharedSessionContractImplementor session) {
+		throw new NotYetImplementedFor6Exception( getClass() );
+	}
+
 	@Override
 	public void breakDownJdbcValues(Object domainValue, JdbcValueConsumer valueConsumer, SharedSessionContractImplementor session) {
 		valueConsumer.consume( domainValue, this );

diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyKeyPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyKeyPart.java
@@ -227,6 +227,21 @@ public List<JdbcMapping> getJdbcMappings() {
 		return Collections.singletonList( jdbcMapping );
 	}
 
+	@Override
+	public Object disassemble(Object value, SharedSessionContractImplementor session) {
+		return anyPart.disassemble( value, session );
+	}
+
+	@Override
+	public int forEachDisassembledJdbcValue(
+			Object value,
+			Clause clause,
+			int offset,
+			JdbcValuesConsumer valuesConsumer,
+			SharedSessionContractImplementor session) {
+		return anyPart.forEachDisassembledJdbcValue( value, clause, offset, valuesConsumer, session );
+	}
+
 	@Override
 	public <T> DomainResult<T> createDomainResult(
 			NavigablePath navigablePath,

diff --git a/.../main/java/org/hibernate/metamodel/mapping/internal/BasicEntityIdentifierMappingImpl.java b/.../main/java/org/hibernate/metamodel/mapping/internal/BasicEntityIdentifierMappingImpl.java
@@ -319,6 +319,16 @@ public Object disassemble(Object value, SharedSessionContractImplementor session
 //		return propertyAccess.getGetter().get( value );
 	}
 
+	@Override
+	public int forEachDisassembledJdbcValue(
+			Object value,
+			Clause clause,
+			int offset,
+			JdbcValuesConsumer valuesConsumer,
+			SharedSessionContractImplementor session) {
+		return idType.forEachDisassembledJdbcValue( value, clause, offset, valuesConsumer, session );
+	}
+
 	@Override
 	public Fetch generateFetch(
 			FetchParent fetchParent,

diff --git a/...ain/java/org/hibernate/metamodel/mapping/internal/CollectionIdentifierDescriptorImpl.java b/...ain/java/org/hibernate/metamodel/mapping/internal/CollectionIdentifierDescriptorImpl.java
@@ -18,6 +18,7 @@
 import org.hibernate.metamodel.model.domain.NavigableRole;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.query.NavigablePath;
+import org.hibernate.sql.ast.Clause;
 import org.hibernate.sql.ast.spi.FromClauseAccess;
 import org.hibernate.sql.ast.spi.SqlAstCreationContext;
 import org.hibernate.sql.ast.spi.SqlAstCreationState;
@@ -253,4 +254,18 @@ public FetchTiming getTiming() {
 		return FetchTiming.IMMEDIATE;
 	}
 
+	@Override
+	public Object disassemble(Object value, SharedSessionContractImplementor session) {
+		return type.disassemble( value, session );
+	}
+
+	@Override
+	public int forEachDisassembledJdbcValue(
+			Object value,
+			Clause clause,
+			int offset,
+			JdbcValuesConsumer valuesConsumer,
+			SharedSessionContractImplementor session) {
+		return type.forEachDisassembledJdbcValue( value, clause, offset, valuesConsumer, session );
+	}
 }
diff --git a/...e/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedCollectionPart.java b/...e/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedCollectionPart.java
@@ -28,6 +28,7 @@
 import org.hibernate.sql.ast.spi.SqlAstCreationContext;
 import org.hibernate.sql.ast.spi.SqlExpressionResolver;
 import org.hibernate.sql.ast.tree.from.StandardVirtualTableGroup;
+import org.hibernate.sql.ast.Clause;
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.ast.tree.from.TableGroupJoin;
 import org.hibernate.sql.ast.tree.predicate.Predicate;
@@ -188,6 +189,27 @@ public int getJdbcTypeCount() {
 		return getDiscriminatorPart().getJdbcTypeCount() + getKeyPart().getJdbcTypeCount();
 	}
 
+	@Override
+	public Object disassemble(Object value, SharedSessionContractImplementor session) {
+		return discriminatorMapping.getDiscriminatorPart().disassemble( value, session );
+	}
+
+	@Override
+	public int forEachDisassembledJdbcValue(
+			Object value,
+			Clause clause,
+			int offset,
+			JdbcValuesConsumer valuesConsumer,
+			SharedSessionContractImplementor session) {
+		return discriminatorMapping.getDiscriminatorPart().forEachDisassembledJdbcValue(
+				value,
+				clause,
+				offset,
+				valuesConsumer,
+				session
+		);
+	}
+
 	@Override
 	public void breakDownJdbcValues(Object domainValue, JdbcValueConsumer valueConsumer, SharedSessionContractImplementor session) {
 		discriminatorMapping.getDiscriminatorPart().breakDownJdbcValues( domainValue, valueConsumer, session );

diff --git a/...e-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityRowIdMappingImpl.java b/...e-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityRowIdMappingImpl.java
@@ -17,6 +17,7 @@
 import org.hibernate.metamodel.mapping.SelectableMapping;
 import org.hibernate.metamodel.model.domain.NavigableRole;
 import org.hibernate.query.NavigablePath;
+import org.hibernate.sql.ast.Clause;
 import org.hibernate.sql.ast.spi.SqlAstCreationState;
 import org.hibernate.sql.ast.spi.SqlExpressionResolver;
 import org.hibernate.sql.ast.spi.SqlSelection;
@@ -121,6 +122,21 @@ public int getJdbcTypeCount() {
 		return 1;
 	}
 
+	@Override
+	public Object disassemble(Object value, SharedSessionContractImplementor session) {
+		return rowIdType.disassemble( value, session );
+	}
+
+	@Override
+	public int forEachDisassembledJdbcValue(
+			Object value,
+			Clause clause,
+			int offset,
+			JdbcValuesConsumer valuesConsumer,
+			SharedSessionContractImplementor session) {
+		return rowIdType.forEachDisassembledJdbcValue( value, clause, offset, valuesConsumer, session );
+	}
+
 	@Override
 	public int forEachJdbcType(int offset, IndexedConsumer<JdbcMapping> action) {
 		action.accept( offset, getJdbcMapping() );

diff --git a/...core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityVersionMappingImpl.java b/...core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityVersionMappingImpl.java
@@ -22,6 +22,7 @@
 import org.hibernate.metamodel.mapping.MappingType;
 import org.hibernate.metamodel.model.domain.NavigableRole;
 import org.hibernate.query.NavigablePath;
+import org.hibernate.sql.ast.Clause;
 import org.hibernate.sql.ast.spi.SqlAstCreationState;
 import org.hibernate.sql.ast.spi.SqlExpressionResolver;
 import org.hibernate.sql.ast.spi.SqlSelection;
@@ -279,4 +280,19 @@ public FetchStyle getStyle() {
 	public FetchTiming getTiming() {
 		return FetchTiming.IMMEDIATE;
 	}
+
+	@Override
+	public Object disassemble(Object value, SharedSessionContractImplementor session) {
+		return versionBasicType.disassemble( value, session );
+	}
+
+	@Override
+	public int forEachDisassembledJdbcValue(
+			Object value,
+			Clause clause,
+			int offset,
+			JdbcValuesConsumer valuesConsumer,
+			SharedSessionContractImplementor session) {
+		return versionBasicType.forEachDisassembledJdbcValue( value, clause, offset, valuesConsumer, session );
+	}
 }
diff --git a/...re/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java b/...re/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java
@@ -41,6 +41,7 @@
 import org.hibernate.persister.entity.Joinable;
 import org.hibernate.property.access.spi.PropertyAccess;
 import org.hibernate.query.NavigablePath;
+import org.hibernate.sql.ast.Clause;
 import org.hibernate.sql.ast.SqlAstJoinType;
 import org.hibernate.sql.ast.spi.FromClauseAccess;
 import org.hibernate.sql.ast.spi.SqlAliasBase;
@@ -781,18 +782,6 @@ public TableGroup createRootTableGroup(
 		}
 	}
 
-	@Override
-	public TableGroup createRootTableGroup(
-			boolean canUseInnerJoins,
-			NavigablePath navigablePath,
-			String explicitSourceAlias,
-			Supplier<Consumer<Predicate>> additionalPredicateCollectorAccess,
-			SqlAliasBase sqlAliasBase,
-			SqlAstCreationState creationState,
-			SqlAstCreationContext creationContext) {
-		throw new NotYetImplementedFor6Exception( getClass() );
-	}
-
 	@Override
 	public boolean isAffectedByEnabledFilters(LoadQueryInfluencers influencers) {
 		return getCollectionDescriptor().isAffectedByEnabledFilters( influencers );
@@ -887,6 +876,16 @@ public Object disassemble(Object value, SharedSessionContractImplementor session
 		return elementDescriptor.disassemble( value,session );
 	}
 
+	@Override
+	public int forEachDisassembledJdbcValue(
+			Object value,
+			Clause clause,
+			int offset,
+			JdbcValuesConsumer valuesConsumer,
+			SharedSessionContractImplementor session) {
+		return elementDescriptor.forEachDisassembledJdbcValue( value, clause, offset, valuesConsumer, session );
+	}
+
 	@Override
 	public int getNumberOfFetchables() {
 		return indexDescriptor == null ? 1 : 2;

diff --git a/...c/main/java/org/hibernate/sql/results/internal/domain/CircularBiDirectionalFetchImpl.java b/...c/main/java/org/hibernate/sql/results/internal/domain/CircularBiDirectionalFetchImpl.java
@@ -25,6 +25,7 @@
 import org.hibernate.persister.entity.UniqueKeyLoadable;
 import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.query.NavigablePath;
+import org.hibernate.sql.ast.Clause;
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.results.graph.AssemblerCreationState;
 import org.hibernate.sql.results.graph.BiDirectionalFetch;
@@ -181,6 +182,21 @@ public Fetch generateFetch(
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
+	public Object disassemble(Object value, SharedSessionContractImplementor session) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public int forEachDisassembledJdbcValue(
+			Object value,
+			Clause clause,
+			int offset,
+			JdbcValuesConsumer valuesConsumer,
+			SharedSessionContractImplementor session) {
+		throw new UnsupportedOperationException();
+	}
+
 	private static class CircularFetchAssembler implements DomainResultAssembler<Object> {
 		private final NavigablePath circularPath;
 		private final JavaType<?> javaTypeDescriptor;

diff --git a/...rnate-core/src/main/java/org/hibernate/sql/results/internal/domain/CircularFetchImpl.java b/...rnate-core/src/main/java/org/hibernate/sql/results/internal/domain/CircularFetchImpl.java
@@ -17,6 +17,7 @@
 import org.hibernate.metamodel.model.domain.NavigableRole;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.query.NavigablePath;
+import org.hibernate.sql.ast.Clause;
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.results.graph.AssemblerCreationState;
 import org.hibernate.sql.results.graph.BiDirectionalFetch;
@@ -237,6 +238,21 @@ public Fetch generateFetch(
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
+	public Object disassemble(Object value, SharedSessionContractImplementor session) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public int forEachDisassembledJdbcValue(
+			Object value,
+			Clause clause,
+			int offset,
+			JdbcValuesConsumer valuesConsumer,
+			SharedSessionContractImplementor session) {
+		throw new UnsupportedOperationException();
+	}
+
 	private static class BiDirectionalFetchAssembler implements DomainResultAssembler {
 		private EntityInitializer initializer;
 		private JavaType assembledJavaTypeDescriptor;