HHH-8822 ValueHolder fields need to be transient if owned by a

Serializable class

Conflicts:
	hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataImpl.java

hibernate-core/src/main/java/org/hibernate/cache/spi/NaturalIdCacheKey.java

@@ -47,6 +47,7 @@ public class NaturalIdCacheKey implements Serializable {
 	private final String entityName;
 	private final String tenantId;
 	private final int hashCode;
+	// "transient" is important here -- NaturalIdCacheKey needs to be Serializable
 	private transient ValueHolder<String> toString;
 
 	/**

hibernate-core/src/main/java/org/hibernate/engine/spi/TypedValue.java

@@ -38,7 +38,8 @@ import org.hibernate.type.Type;
 public final class TypedValue implements Serializable {
 	private final Type type;
 	private final Object value;
-	private final ValueHolder<Integer> hashcode;
+	// "transient" is important here -- NaturalIdCacheKey needs to be Serializable
+	private final transient ValueHolder<Integer> hashcode;
 
 	public TypedValue(final Type type, final Object value) {
 		this.type = type;

hibernate-core/src/main/java/org/hibernate/internal/util/ValueHolder.java

@@ -26,6 +26,8 @@ package org.hibernate.internal.util;
 /**
  * Represents a "final" value that is initialized either {@link #ValueHolder(Object) up front} or once at some point
  * {@link #ValueHolder(ValueHolder.DeferredInitializer) after} declaration.
+ * 
+ * Note: If a Serializable class has a {@link ValueHolder} property, that property should be declared transient!
  *
  * @author Steve Ebersole
  */

hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataImpl.java

@@ -86,8 +86,8 @@ public class MetadataImpl implements MetadataImplementor, Serializable {
 	private final ServiceRegistry serviceRegistry;
 	private final Options options;
 
-	private final ValueHolder<ClassLoaderService> classLoaderService;
-	private final ValueHolder<PersisterClassResolver> persisterClassResolverService;
+	private final transient ValueHolder<ClassLoaderService> classLoaderService;
+	private final transient ValueHolder<PersisterClassResolver> persisterClassResolverService;
 
 	private TypeResolver typeResolver = new TypeResolver();