Skip to content

Commit 0ca742c

Browse files
dreab8claude
dreab8
and
claude
committed
HHH-20589 Continue switching tests using hbm.xml to use mapping.xml
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent c909d2c commit 0ca742c

525 files changed

Lines changed: 8186 additions & 6770 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/ProductLine.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
public class ProductLine {
1313
private Integer id;
1414
private String description;
15-
private Set models = new HashSet();
15+
private Set<Model> models = new HashSet<>();
1616

1717
public ProductLine() {
1818
}
@@ -33,10 +33,10 @@ public Integer getId() {
3333
public void setId(Integer id) {
3434
this.id = id;
3535
}
36-
public Set getModels() {
36+
public Set<Model> getModels() {
3737
return models;
3838
}
39-
public void setModels(Set models) {
39+
public void setModels(Set<Model> models) {
4040
this.models = models;
4141
}
4242
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/cid/CompositeIdWithGeneratorTest.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@
3333
*/
3434
@JiraKey("HHH-2060")
3535
@DomainModel(
36-
xmlMappings = {
37-
"org/hibernate/orm/test/cid/PurchaseRecord.hbm.xml"
38-
}
36+
annotatedClasses = { PurchaseRecord.class, PurchaseDetail.class }
3937
)
4038
@SessionFactory
4139
public class CompositeIdWithGeneratorTest {

‎hibernate-core/src/test/java/org/hibernate/orm/test/cid/PurchaseDetail.java‎

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,24 @@
44
*/
55
package org.hibernate.orm.test.cid;
66

7-
8-
9-
/**
10-
* @author Jacob Robertson
11-
*/
7+
import jakarta.persistence.Entity;
8+
import jakarta.persistence.FetchType;
9+
import jakarta.persistence.Id;
10+
import jakarta.persistence.JoinColumn;
11+
import jakarta.persistence.JoinColumns;
12+
import jakarta.persistence.ManyToOne;
13+
14+
@Entity
1215
public class PurchaseDetail {
1316

17+
@ManyToOne(fetch = FetchType.LAZY)
18+
@JoinColumns({
19+
@JoinColumn(name = "purchaseNumber", nullable = false),
20+
@JoinColumn(name = "purchaseSequence", nullable = false)
21+
})
1422
private PurchaseRecord purchaseRecord;
1523

24+
@Id
1625
private String productId;
1726
private int quantity;
1827

@@ -21,42 +30,29 @@ public PurchaseDetail(PurchaseRecord record, String productId, int quantity) {
2130
this.quantity = quantity;
2231
this.purchaseRecord = record;
2332
}
24-
public PurchaseDetail() {}
2533

34+
public PurchaseDetail() {}
2635

27-
/**
28-
* @return the purchaseRecord
29-
*/
3036
public PurchaseRecord getPurchaseRecord() {
3137
return purchaseRecord;
3238
}
33-
/**
34-
* @param purchaseRecord the purchaseRecord to set
35-
*/
39+
3640
public void setPurchaseRecord(PurchaseRecord purchaseRecord) {
3741
this.purchaseRecord = purchaseRecord;
3842
}
39-
/**
40-
* @return the quantity
41-
*/
43+
4244
public int getQuantity() {
4345
return quantity;
4446
}
45-
/**
46-
* @param quantity the quantity to set
47-
*/
47+
4848
public void setQuantity(int quantity) {
4949
this.quantity = quantity;
5050
}
51-
/**
52-
* @return the productId
53-
*/
51+
5452
public String getProductId() {
5553
return productId;
5654
}
57-
/**
58-
* @param productId the productId to set
59-
*/
55+
6056
public void setProductId(String productId) {
6157
this.productId = productId;
6258
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/cid/PurchaseRecord.java‎

Lines changed: 29 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,26 @@
33
* Copyright Red Hat Inc. and Hibernate Authors
44
*/
55
package org.hibernate.orm.test.cid;
6+
67
import java.io.Serializable;
78
import java.util.Date;
89
import java.util.HashSet;
910
import java.util.Set;
1011

11-
/**
12-
* @author Jacob Robertson
13-
*/
12+
import jakarta.persistence.CascadeType;
13+
import jakarta.persistence.Column;
14+
import jakarta.persistence.Embeddable;
15+
import jakarta.persistence.EmbeddedId;
16+
import jakarta.persistence.Entity;
17+
import jakarta.persistence.FetchType;
18+
import jakarta.persistence.OneToMany;
19+
20+
import org.hibernate.annotations.GenericGenerator;
21+
22+
@Entity
1423
public class PurchaseRecord {
24+
25+
@Embeddable
1526
public static class Id implements Serializable {
1627
private int purchaseNumber;
1728
private String purchaseSequence;
@@ -22,33 +33,26 @@ public Id(int purchaseNumber, String purchaseSequence) {
2233
}
2334
public Id() {}
2435

25-
/**
26-
* @return Returns the purchaseNumber.
27-
*/
2836
public int getPurchaseNumber() {
2937
return purchaseNumber;
3038
}
31-
/**
32-
* @param purchaseNumber The purchaseNumber to set.
33-
*/
39+
3440
public void setPurchaseNumber(int purchaseNumber) {
3541
this.purchaseNumber = purchaseNumber;
3642
}
37-
/**
38-
* @return the purchaseSequence
39-
*/
43+
4044
public String getPurchaseSequence() {
4145
return purchaseSequence;
4246
}
43-
/**
44-
* @param purchaseSequence the purchaseSequence to set
45-
*/
47+
4648
public void setPurchaseSequence(String purchaseSequence) {
4749
this.purchaseSequence = purchaseSequence;
4850
}
51+
4952
public int hashCode() {
5053
return purchaseNumber + purchaseSequence.hashCode();
5154
}
55+
5256
public boolean equals(Object other) {
5357
if (other instanceof Id) {
5458
Id that = (Id) other;
@@ -61,49 +65,38 @@ public boolean equals(Object other) {
6165
}
6266
}
6367

68+
@EmbeddedId
69+
@GenericGenerator(type = PurchaseRecordIdGenerator.class)
6470
private Id id;
71+
72+
@Column(name = "`timestamp`")
6573
private Date timestamp;
66-
private Set details = new HashSet();
74+
75+
@OneToMany(mappedBy = "purchaseRecord", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
76+
private Set<PurchaseDetail> details = new HashSet<>();
6777

6878
public PurchaseRecord() {}
6979

70-
/**
71-
* @return Returns the id.
72-
*/
7380
public Id getId() {
7481
return id;
7582
}
76-
/**
77-
* @param id The id to set.
78-
*/
83+
7984
public void setId(Id id) {
8085
this.id = id;
8186
}
8287

83-
/**
84-
* @return the details
85-
*/
86-
public Set getDetails() {
88+
public Set<PurchaseDetail> getDetails() {
8789
return details;
8890
}
8991

90-
/**
91-
* @param details the details to set
92-
*/
93-
public void setDetails(Set details) {
92+
public void setDetails(Set<PurchaseDetail> details) {
9493
this.details = details;
9594
}
9695

97-
/**
98-
* @return the timestamp
99-
*/
10096
public Date getTimestamp() {
10197
return timestamp;
10298
}
10399

104-
/**
105-
* @param timestamp the timestamp to set
106-
*/
107100
public void setTimestamp(Date timestamp) {
108101
this.timestamp = timestamp;
109102
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/Mail.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,31 @@
44
*/
55
package org.hibernate.orm.test.collection.propertyref;
66

7+
import jakarta.persistence.CascadeType;
8+
import jakarta.persistence.Column;
9+
import jakarta.persistence.Entity;
10+
import jakarta.persistence.GeneratedValue;
11+
import jakarta.persistence.GenerationType;
12+
import jakarta.persistence.Id;
13+
import jakarta.persistence.JoinColumn;
14+
import jakarta.persistence.ManyToOne;
15+
import jakarta.persistence.Table;
716

17+
18+
@Entity
19+
@Table(name = "t_mail")
820
public class Mail {
921

22+
@Id
23+
@GeneratedValue(strategy = GenerationType.AUTO)
24+
@Column(name = "id")
1025
private Integer id;
26+
27+
@Column(name = "`alias`", length = 20)
1128
private String alias;
29+
30+
@ManyToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST })
31+
@JoinColumn(name = "userid", referencedColumnName = "userid", nullable = false)
1232
private User user;
1333

1434
Mail() {

‎hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/PropertyRefTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
*/
2525
@JiraKey(value = "HHH-565")
2626
@DomainModel(
27-
xmlMappings = {
28-
"org/hibernate/orm/test/collection/propertyref/User.hbm.xml",
29-
"org/hibernate/orm/test/collection/propertyref/Mail.hbm.xml"
27+
annotatedClasses = {
28+
User.class,
29+
Mail.class
3030
}
3131
)
3232
@SessionFactory

‎hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/User.java‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,34 @@
77
import java.util.HashSet;
88
import java.util.Set;
99

10+
import jakarta.persistence.CascadeType;
11+
import jakarta.persistence.Column;
12+
import jakarta.persistence.Entity;
13+
import jakarta.persistence.FetchType;
14+
import jakarta.persistence.GeneratedValue;
15+
import jakarta.persistence.GenerationType;
16+
import jakarta.persistence.Id;
17+
import jakarta.persistence.OneToMany;
18+
import jakarta.persistence.Table;
1019

20+
import org.hibernate.annotations.Fetch;
21+
import org.hibernate.annotations.FetchMode;
22+
23+
24+
@Entity
25+
@Table(name = "t_user")
1126
public class User {
1227

28+
@Id
29+
@GeneratedValue(strategy = GenerationType.AUTO)
30+
@Column(name = "id")
1331
private Integer id;
32+
33+
@Column(name = "userid", length = 32, nullable = false)
1434
private String userid;
35+
36+
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
37+
@Fetch(FetchMode.JOIN)
1538
private Set<Mail> mail = new HashSet();
1639

1740
public User() {

‎hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/lazy/Mail.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,31 @@
44
*/
55
package org.hibernate.orm.test.collection.propertyref.lazy;
66

7+
import jakarta.persistence.CascadeType;
8+
import jakarta.persistence.Column;
9+
import jakarta.persistence.Entity;
10+
import jakarta.persistence.GeneratedValue;
11+
import jakarta.persistence.GenerationType;
12+
import jakarta.persistence.Id;
13+
import jakarta.persistence.JoinColumn;
14+
import jakarta.persistence.ManyToOne;
15+
import jakarta.persistence.Table;
716

17+
18+
@Entity
19+
@Table(name = "t_mail")
820
public class Mail {
921

22+
@Id
23+
@GeneratedValue(strategy = GenerationType.AUTO)
24+
@Column(name = "id")
1025
private Integer id;
26+
27+
@Column(name = "`alias`", length = 20)
1128
private String alias;
29+
30+
@ManyToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST })
31+
@JoinColumn(name = "userid", referencedColumnName = "userid", nullable = false)
1232
private User user;
1333

1434
Mail() {

‎hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/lazy/PropertyRefTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
*/
2525
@JiraKey(value = "HHH-565")
2626
@DomainModel(
27-
xmlMappings = {
28-
"org/hibernate/orm/test/collection/propertyref/lazy/User.hbm.xml",
29-
"org/hibernate/orm/test/collection/propertyref/lazy/Mail.hbm.xml"
27+
annotatedClasses = {
28+
User.class,
29+
Mail.class
3030
}
3131
)
3232
@SessionFactory

‎hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/lazy/User.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,29 @@
77
import java.util.HashSet;
88
import java.util.Set;
99

10+
import jakarta.persistence.CascadeType;
11+
import jakarta.persistence.Column;
12+
import jakarta.persistence.Entity;
13+
import jakarta.persistence.GeneratedValue;
14+
import jakarta.persistence.GenerationType;
15+
import jakarta.persistence.Id;
16+
import jakarta.persistence.OneToMany;
17+
import jakarta.persistence.Table;
1018

19+
20+
@Entity
21+
@Table(name = "t_user")
1122
public class User {
1223

24+
@Id
25+
@GeneratedValue(strategy = GenerationType.AUTO)
26+
@Column(name = "id")
1327
private Integer id;
28+
29+
@Column(name = "userid", length = 32, nullable = false)
1430
private String userid;
31+
32+
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
1533
private Set<Mail> mail = new HashSet();
1634

1735
public User() {

0 commit comments

Comments
 (0)