HHH-15045 + HHH-15235 onFlushDirty() invoked on parent entity in a @OneToOne relationship when no table columns are changed - PropertyAccessException on merging Bidirectional OneToOne with EmbeddedId - Reverted HHH-14216

hibernate-core/src/main/java/org/hibernate/type/OneToOneType.java

@@ -142,7 +142,7 @@ public class OneToOneType extends EntityType {
 	@Override
 	public Object assemble(Serializable oid, SharedSessionContractImplementor session, Object owner) throws HibernateException {
 		//this should be a call to resolve(), not resolveIdentifier(),
-		//'cos it might be a property-ref, and we did not cache the
+		//because it might be a property-ref, and we did not cache the
 		//referenced value
 		return resolve( session.getContextEntityIdentifier(owner), session, owner );
 	}

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/EmbeddedIdTest.java

@@ -48,7 +48,6 @@ public class EmbeddedIdTest {
 					foo.bar = bar;
 					bar.foo = foo;
 					session.merge( foo );
-					session.flush();
 				}
 		);
 	}

hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/flush/DirtyFlushTest.java

@@ -59,7 +59,6 @@ public class DirtyFlushTest {
 			user.profile = profile;
 
 			em.persist( profile );
-			em.flush();
 		} );
 
 		scope.inTransaction( em -> {