Incorrect deletion logic is generation for OneToOne relationships and inverse sides of ManyToMany relationships

Given two classes Foo and Bar the following deletion code is generated for bidirectional OneToOne relationship between them:

Foo foo = deletableEntity.getFoo();deletableEntity.setBar(null);this.entityManager.merge(foo);

Example bar = deletableEntity.getBar();deletableEntity.setFoo(null);this.entityManager.merge(bar);

This is incorrect - the setters on the deletableEntity should not be invoked.