HHH-17257 Add test for issue
This commit is contained in:
parent
493594b771
commit
2857491acf
|
@ -0,0 +1,151 @@
|
|||
package org.hibernate.orm.test.embeddable;
|
||||
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
|
||||
import org.hibernate.testing.orm.junit.DomainModel;
|
||||
import org.hibernate.testing.orm.junit.JiraKey;
|
||||
import org.hibernate.testing.orm.junit.SessionFactory;
|
||||
import org.hibernate.testing.orm.junit.SessionFactoryScope;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.ElementCollection;
|
||||
import jakarta.persistence.Embeddable;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.Id;
|
||||
|
||||
import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
|
||||
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
ElementCollectionAllNonOptionalPropertyUpdateTest.MyEntity.class
|
||||
}
|
||||
)
|
||||
@SessionFactory
|
||||
@JiraKey( "HHH-17257" )
|
||||
public class ElementCollectionAllNonOptionalPropertyUpdateTest {
|
||||
|
||||
private static final Long ENTITY_ID = 1l;
|
||||
|
||||
@BeforeAll
|
||||
public void setUp(SessionFactoryScope scope) {
|
||||
scope.inTransaction(
|
||||
session -> {
|
||||
MyEntity myEntity = new MyEntity( ENTITY_ID, Set.of(
|
||||
new MyEmbeddable( "1", false ),
|
||||
new MyEmbeddable( "2", false )
|
||||
) );
|
||||
session.persist( myEntity );
|
||||
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUpdateElement(SessionFactoryScope scope) {
|
||||
|
||||
scope.inTransaction(
|
||||
session -> {
|
||||
MyEntity myEntity = session.find( MyEntity.class, ENTITY_ID );
|
||||
Set<MyEmbeddable> elementCollection = myEntity.getElementCollection();
|
||||
assertThat( elementCollection ).hasSize( 2 );
|
||||
|
||||
elementCollection.stream().filter( it -> it.getStringField().equals( "1" ) ).forEach(
|
||||
it -> it.setBooleanField( true ) );
|
||||
}
|
||||
);
|
||||
|
||||
scope.inTransaction(
|
||||
session -> {
|
||||
MyEntity myEntity = session.find( MyEntity.class, ENTITY_ID );
|
||||
assertThat( myEntity.getElementCollection() ).hasSize( 2 );
|
||||
assertThat( myEntity.getElementCollection() ).extracting( MyEmbeddable::isBooleanField )
|
||||
.containsExactlyInAnyOrder( true, false );
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@Entity(name = "MyEntity")
|
||||
public static class MyEntity {
|
||||
@Id
|
||||
private Long id;
|
||||
|
||||
@ElementCollection(fetch = FetchType.EAGER)
|
||||
private Set<MyEmbeddable> elementCollection;
|
||||
|
||||
public MyEntity() {
|
||||
}
|
||||
|
||||
public MyEntity(Long id, Set<MyEmbeddable> elementCollection) {
|
||||
this.id = id;
|
||||
this.elementCollection = elementCollection;
|
||||
}
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public Set<MyEmbeddable> getElementCollection() {
|
||||
return elementCollection;
|
||||
}
|
||||
|
||||
public void setElementCollection(Set<MyEmbeddable> elementCollection) {
|
||||
this.elementCollection = elementCollection;
|
||||
}
|
||||
}
|
||||
|
||||
@Embeddable
|
||||
public static class MyEmbeddable {
|
||||
@Column(nullable = false)
|
||||
private String stringField;
|
||||
|
||||
@Column(nullable = false)
|
||||
private boolean booleanField;
|
||||
|
||||
public MyEmbeddable() {
|
||||
}
|
||||
|
||||
public MyEmbeddable(String stringField, boolean booleanField) {
|
||||
this.stringField = stringField;
|
||||
this.booleanField = booleanField;
|
||||
}
|
||||
|
||||
public String getStringField() {
|
||||
return stringField;
|
||||
}
|
||||
|
||||
public void setStringField(String stringField) {
|
||||
this.stringField = stringField;
|
||||
}
|
||||
|
||||
public boolean isBooleanField() {
|
||||
return booleanField;
|
||||
}
|
||||
|
||||
public void setBooleanField(boolean booleanField) {
|
||||
this.booleanField = booleanField;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if ( this == o ) {
|
||||
return true;
|
||||
}
|
||||
if ( o == null || getClass() != o.getClass() ) {
|
||||
return false;
|
||||
}
|
||||
MyEmbeddable that = (MyEmbeddable) o;
|
||||
return booleanField == that.booleanField && Objects.equals( stringField, that.stringField );
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash( stringField, booleanField );
|
||||
}
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,152 @@
|
|||
package org.hibernate.orm.test.embeddable;
|
||||
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
|
||||
import org.hibernate.testing.orm.junit.DomainModel;
|
||||
import org.hibernate.testing.orm.junit.JiraKey;
|
||||
import org.hibernate.testing.orm.junit.SessionFactory;
|
||||
import org.hibernate.testing.orm.junit.SessionFactoryScope;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.ElementCollection;
|
||||
import jakarta.persistence.Embeddable;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.Id;
|
||||
|
||||
import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
|
||||
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
ElementCollectionNonOptionalPropertyUpdateTest.MyEntity.class
|
||||
}
|
||||
)
|
||||
@SessionFactory
|
||||
@JiraKey( "HHH-17257" )
|
||||
public class ElementCollectionNonOptionalPropertyUpdateTest {
|
||||
|
||||
private static final Long ENTITY_ID = 1l;
|
||||
|
||||
@BeforeAll
|
||||
public void setUp(SessionFactoryScope scope) {
|
||||
scope.inTransaction(
|
||||
session -> {
|
||||
MyEntity myEntity = new MyEntity( ENTITY_ID, Set.of(
|
||||
new MyEmbeddable( "1", false ),
|
||||
new MyEmbeddable( "2", false )
|
||||
) );
|
||||
session.persist( myEntity );
|
||||
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUpdateElement(SessionFactoryScope scope) {
|
||||
|
||||
scope.inTransaction(
|
||||
session -> {
|
||||
MyEntity myEntity = session.find( MyEntity.class, ENTITY_ID );
|
||||
Set<MyEmbeddable> elementCollection = myEntity.getElementCollection();
|
||||
assertThat( elementCollection ).hasSize( 2 );
|
||||
|
||||
elementCollection.stream().filter( it -> it.getStringField().equals( "1" ) ).forEach(
|
||||
it -> it.setBooleanField( true ) );
|
||||
}
|
||||
);
|
||||
|
||||
scope.inTransaction(
|
||||
session -> {
|
||||
MyEntity myEntity = session.find( MyEntity.class, ENTITY_ID );
|
||||
assertThat( myEntity.getElementCollection() ).hasSize( 2 );
|
||||
assertThat( myEntity.getElementCollection() ).extracting( MyEmbeddable::isBooleanField )
|
||||
.containsExactlyInAnyOrder( true, false );
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@Entity(name = "MyEntity")
|
||||
public static class MyEntity {
|
||||
@Id
|
||||
private Long id;
|
||||
|
||||
@ElementCollection(fetch = FetchType.EAGER)
|
||||
private Set<MyEmbeddable> elementCollection;
|
||||
|
||||
public MyEntity() {
|
||||
}
|
||||
|
||||
public MyEntity(Long id, Set<MyEmbeddable> elementCollection) {
|
||||
this.id = id;
|
||||
this.elementCollection = elementCollection;
|
||||
}
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public Set<MyEmbeddable> getElementCollection() {
|
||||
return elementCollection;
|
||||
}
|
||||
|
||||
public void setElementCollection(Set<MyEmbeddable> elementCollection) {
|
||||
this.elementCollection = elementCollection;
|
||||
}
|
||||
}
|
||||
|
||||
@Embeddable
|
||||
public static class MyEmbeddable {
|
||||
@Column
|
||||
private String stringField;
|
||||
|
||||
@Column
|
||||
// the field is considered non-optional because of its primitive type
|
||||
private boolean booleanField;
|
||||
|
||||
public MyEmbeddable() {
|
||||
}
|
||||
|
||||
public MyEmbeddable(String stringField, boolean booleanField) {
|
||||
this.stringField = stringField;
|
||||
this.booleanField = booleanField;
|
||||
}
|
||||
|
||||
public String getStringField() {
|
||||
return stringField;
|
||||
}
|
||||
|
||||
public void setStringField(String stringField) {
|
||||
this.stringField = stringField;
|
||||
}
|
||||
|
||||
public boolean isBooleanField() {
|
||||
return booleanField;
|
||||
}
|
||||
|
||||
public void setBooleanField(boolean booleanField) {
|
||||
this.booleanField = booleanField;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if ( this == o ) {
|
||||
return true;
|
||||
}
|
||||
if ( o == null || getClass() != o.getClass() ) {
|
||||
return false;
|
||||
}
|
||||
MyEmbeddable that = (MyEmbeddable) o;
|
||||
return booleanField == that.booleanField && Objects.equals( stringField, that.stringField );
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash( stringField, booleanField );
|
||||
}
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,151 @@
|
|||
package org.hibernate.orm.test.embeddable;
|
||||
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
|
||||
import org.hibernate.testing.orm.junit.DomainModel;
|
||||
import org.hibernate.testing.orm.junit.JiraKey;
|
||||
import org.hibernate.testing.orm.junit.SessionFactory;
|
||||
import org.hibernate.testing.orm.junit.SessionFactoryScope;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.ElementCollection;
|
||||
import jakarta.persistence.Embeddable;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.Id;
|
||||
|
||||
import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
|
||||
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
ElementCollectionOptionalPropertyUpdateTest.MyEntity.class
|
||||
}
|
||||
)
|
||||
@SessionFactory
|
||||
@JiraKey( "HHH-17257" )
|
||||
public class ElementCollectionOptionalPropertyUpdateTest {
|
||||
|
||||
private static final Long ENTITY_ID = 1l;
|
||||
|
||||
@BeforeAll
|
||||
public void setUp(SessionFactoryScope scope) {
|
||||
scope.inTransaction(
|
||||
session -> {
|
||||
MyEntity myEntity = new MyEntity( ENTITY_ID, Set.of(
|
||||
new MyEmbeddable( "1", false ),
|
||||
new MyEmbeddable( "2", false )
|
||||
) );
|
||||
session.persist( myEntity );
|
||||
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUpdateElement(SessionFactoryScope scope) {
|
||||
|
||||
scope.inTransaction(
|
||||
session -> {
|
||||
MyEntity myEntity = session.find( MyEntity.class, ENTITY_ID );
|
||||
Set<MyEmbeddable> elementCollection = myEntity.getElementCollection();
|
||||
assertThat( elementCollection ).hasSize( 2 );
|
||||
|
||||
elementCollection.stream().filter( it -> it.getStringField().equals( "1" ) ).forEach(
|
||||
it -> it.setBooleanField( true ) );
|
||||
}
|
||||
);
|
||||
|
||||
scope.inTransaction(
|
||||
session -> {
|
||||
MyEntity myEntity = session.find( MyEntity.class, ENTITY_ID );
|
||||
assertThat( myEntity.getElementCollection() ).hasSize( 2 );
|
||||
assertThat( myEntity.getElementCollection() ).extracting( MyEmbeddable::isBooleanField )
|
||||
.containsExactlyInAnyOrder( true, false );
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@Entity(name = "MyEntity")
|
||||
public static class MyEntity {
|
||||
@Id
|
||||
private Long id;
|
||||
|
||||
@ElementCollection(fetch = FetchType.EAGER)
|
||||
private Set<MyEmbeddable> elementCollection;
|
||||
|
||||
public MyEntity() {
|
||||
}
|
||||
|
||||
public MyEntity(Long id, Set<MyEmbeddable> elementCollection) {
|
||||
this.id = id;
|
||||
this.elementCollection = elementCollection;
|
||||
}
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public Set<MyEmbeddable> getElementCollection() {
|
||||
return elementCollection;
|
||||
}
|
||||
|
||||
public void setElementCollection(Set<MyEmbeddable> elementCollection) {
|
||||
this.elementCollection = elementCollection;
|
||||
}
|
||||
}
|
||||
|
||||
@Embeddable
|
||||
public static class MyEmbeddable {
|
||||
@Column
|
||||
private String stringField;
|
||||
|
||||
@Column
|
||||
private Boolean booleanField;
|
||||
|
||||
public MyEmbeddable() {
|
||||
}
|
||||
|
||||
public MyEmbeddable(String stringField, boolean booleanField) {
|
||||
this.stringField = stringField;
|
||||
this.booleanField = booleanField;
|
||||
}
|
||||
|
||||
public String getStringField() {
|
||||
return stringField;
|
||||
}
|
||||
|
||||
public void setStringField(String stringField) {
|
||||
this.stringField = stringField;
|
||||
}
|
||||
|
||||
public Boolean isBooleanField() {
|
||||
return booleanField;
|
||||
}
|
||||
|
||||
public void setBooleanField(Boolean booleanField) {
|
||||
this.booleanField = booleanField;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if ( this == o ) {
|
||||
return true;
|
||||
}
|
||||
if ( o == null || getClass() != o.getClass() ) {
|
||||
return false;
|
||||
}
|
||||
MyEmbeddable that = (MyEmbeddable) o;
|
||||
return booleanField == that.booleanField && Objects.equals( stringField, that.stringField );
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash( stringField, booleanField );
|
||||
}
|
||||
}
|
||||
|
||||
}
|
Loading…
Reference in New Issue