From 05d7d5413144bae3eb577ac3ecc3dae03fed88db Mon Sep 17 00:00:00 2001 From: Krzysztof Majewski Date: Mon, 20 Aug 2018 21:24:50 +0200 Subject: [PATCH 1/6] BAEL-2056 --- .../hibernate/joincolumn/Address.Java | 19 ++++++++++++++ .../baeldung/hibernate/joincolumn/Email.java | 22 ++++++++++++++++ .../hibernate/joincolumn/Employee.java | 21 ++++++++++++++++ .../baeldung/hibernate/joincolumn/Office.java | 25 +++++++++++++++++++ 4 files changed, 87 insertions(+) create mode 100644 hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Address.Java create mode 100644 hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Email.java create mode 100644 hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Employee.java create mode 100644 hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Office.java diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Address.Java b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Address.Java new file mode 100644 index 0000000000..c8c0ae6eb8 --- /dev/null +++ b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Address.Java @@ -0,0 +1,19 @@ +package com.baeldung.hibernate.joincolumn; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +@Entity +class Address { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private Long id; + + @Column(name = "ZIP") + private String zipCode; + +} \ No newline at end of file diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Email.java b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Email.java new file mode 100644 index 0000000000..6519c2011f --- /dev/null +++ b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Email.java @@ -0,0 +1,22 @@ +package com.baeldung.hibernate.joincolumn; + +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; + +@Entity +class Email { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "employee_id") + private Employee employee; + +} \ No newline at end of file diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Employee.java b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Employee.java new file mode 100644 index 0000000000..5d63c3be11 --- /dev/null +++ b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Employee.java @@ -0,0 +1,21 @@ +package com.baeldung.hibernate.joincolumn; + +import java.util.List; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.OneToMany; + +@Entity +class Employee { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private Long id; + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "employee") + private List emails; + +} \ No newline at end of file diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Office.java b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Office.java new file mode 100644 index 0000000000..5ca62af99c --- /dev/null +++ b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Office.java @@ -0,0 +1,25 @@ +package com.baeldung.hibernate.joincolumn; + +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinColumns; +import javax.persistence.ManyToOne; + +@Entity +class Office { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumns({ + @JoinColumn(name="ADDR_ID", referencedColumnName="ID"), + @JoinColumn(name="ADDR_ZIP", referencedColumnName="ZIP") + }) + private Address address; +} \ No newline at end of file From 3d09c6056adc525d9c2146ed02406f099ec43669 Mon Sep 17 00:00:00 2001 From: Krzysztof Majewski Date: Mon, 20 Aug 2018 21:46:55 +0200 Subject: [PATCH 2/6] BAEL-2097 fix --- .../main/java/com/baeldung/hibernate/joincolumn/Address.Java | 2 +- .../src/main/java/com/baeldung/hibernate/joincolumn/Email.java | 2 +- .../main/java/com/baeldung/hibernate/joincolumn/Employee.java | 2 +- .../src/main/java/com/baeldung/hibernate/joincolumn/Office.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Address.Java b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Address.Java index c8c0ae6eb8..531a5dea9e 100644 --- a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Address.Java +++ b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Address.Java @@ -7,7 +7,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; @Entity -class Address { +public class Address { @Id @GeneratedValue(strategy = GenerationType.AUTO) diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Email.java b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Email.java index 6519c2011f..0c5c1e9f7e 100644 --- a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Email.java +++ b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Email.java @@ -9,7 +9,7 @@ import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; @Entity -class Email { +public class Email { @Id @GeneratedValue(strategy = GenerationType.AUTO) diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Employee.java b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Employee.java index 5d63c3be11..03becac9f6 100644 --- a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Employee.java +++ b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Employee.java @@ -9,7 +9,7 @@ import javax.persistence.Id; import javax.persistence.OneToMany; @Entity -class Employee { +public class Employee { @Id @GeneratedValue(strategy = GenerationType.AUTO) diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Office.java b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Office.java index 5ca62af99c..1eb79cb3e6 100644 --- a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Office.java +++ b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Office.java @@ -10,7 +10,7 @@ import javax.persistence.JoinColumns; import javax.persistence.ManyToOne; @Entity -class Office { +public class Office { @Id @GeneratedValue(strategy = GenerationType.AUTO) From b27d20a46a6b3b8329f89ff4ac8235f1e059dc75 Mon Sep 17 00:00:00 2001 From: Krzysztof Majewski Date: Mon, 20 Aug 2018 21:50:24 +0200 Subject: [PATCH 3/6] Delete Address.Java Remove file with wrong extension --- .../hibernate/joincolumn/Address.Java | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Address.Java diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Address.Java b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Address.Java deleted file mode 100644 index 531a5dea9e..0000000000 --- a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Address.Java +++ /dev/null @@ -1,19 +0,0 @@ -package com.baeldung.hibernate.joincolumn; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; - -@Entity -public class Address { - - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - private Long id; - - @Column(name = "ZIP") - private String zipCode; - -} \ No newline at end of file From 82ad3bde94635966d804575bc0d984c7f4fd39d1 Mon Sep 17 00:00:00 2001 From: Krzysztof Majewski Date: Mon, 20 Aug 2018 21:51:20 +0200 Subject: [PATCH 4/6] BAEL-2097 add Address entity --- .../hibernate/joincolumn/Address.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Address.java diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Address.java b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Address.java new file mode 100644 index 0000000000..531a5dea9e --- /dev/null +++ b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Address.java @@ -0,0 +1,19 @@ +package com.baeldung.hibernate.joincolumn; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +@Entity +public class Address { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private Long id; + + @Column(name = "ZIP") + private String zipCode; + +} \ No newline at end of file From cc4b50a0d8aa37b74ada0a7dfdc03d00dc36a1f3 Mon Sep 17 00:00:00 2001 From: Krzysztof Majewski Date: Sat, 25 Aug 2018 14:26:23 +0200 Subject: [PATCH 5/6] BAEL-2097 add integration test --- .../hibernate/joincolumn/Address.java | 15 +++++ .../baeldung/hibernate/joincolumn/Email.java | 25 ++++++++ .../hibernate/joincolumn/Employee.java | 15 +++++ .../baeldung/hibernate/joincolumn/Office.java | 16 ++++++ .../joincolumn/JoinColumnIntegrationTest | 57 +++++++++++++++++++ 5 files changed, 128 insertions(+) create mode 100644 hibernate5/src/test/java/com/baeldung/hibernate/joincolumn/JoinColumnIntegrationTest diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Address.java b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Address.java index 531a5dea9e..8b0a51858d 100644 --- a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Address.java +++ b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Address.java @@ -16,4 +16,19 @@ public class Address { @Column(name = "ZIP") private String zipCode; + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getZipCode() { + return zipCode; + } + + public void setZipCode(String zipCode) { + this.zipCode = zipCode; + } } \ No newline at end of file diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Email.java b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Email.java index 0c5c1e9f7e..a91fb3b4c9 100644 --- a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Email.java +++ b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Email.java @@ -15,8 +15,33 @@ public class Email { @GeneratedValue(strategy = GenerationType.AUTO) private Long id; + private String address; + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "employee_id") private Employee employee; + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public Employee getEmployee() { + return employee; + } + + public void setEmployee(Employee employee) { + this.employee = employee; + } } \ No newline at end of file diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Employee.java b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Employee.java index 03becac9f6..3fbdb3820e 100644 --- a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Employee.java +++ b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Employee.java @@ -18,4 +18,19 @@ public class Employee { @OneToMany(fetch = FetchType.LAZY, mappedBy = "employee") private List emails; + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public List getEmails() { + return emails; + } + + public void setEmails(List emails) { + this.emails = emails; + } } \ No newline at end of file diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Office.java b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Office.java index 1eb79cb3e6..e5b9dc06bc 100644 --- a/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Office.java +++ b/hibernate5/src/main/java/com/baeldung/hibernate/joincolumn/Office.java @@ -22,4 +22,20 @@ public class Office { @JoinColumn(name="ADDR_ZIP", referencedColumnName="ZIP") }) private Address address; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Address getAddress() { + return address; + } + + public void setAddress(Address address) { + this.address = address; + } } \ No newline at end of file diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/joincolumn/JoinColumnIntegrationTest b/hibernate5/src/test/java/com/baeldung/hibernate/joincolumn/JoinColumnIntegrationTest new file mode 100644 index 0000000000..8246a2b01e --- /dev/null +++ b/hibernate5/src/test/java/com/baeldung/hibernate/joincolumn/JoinColumnIntegrationTest @@ -0,0 +1,57 @@ +package com.baeldung.hibernate.joincolumn; + +import com.baeldung.hibernate.HibernateUtil; +import java.io.IOException; +import org.hibernate.Session; +import org.hibernate.Transaction; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + + +public class JoinColumnIntegrationTest { + + private Session session; + private Transaction transaction; + + @Before + public void setUp() throws IOException { + session = HibernateUtil.getSessionFactory("hibernate-spatial.properties") + .openSession(); + transaction = session.beginTransaction(); + } + + @After + public void tearDown() { + transaction.rollback(); + session.close(); + } + + @Test + public void givenOfficeEntity_setAddress_shouldPersist() { + Office office = new Office(); + + Address address = new Address(); + address.setZipCode("11-111"); + office.setAddress(address); + + session.save(office); + session.flush(); + session.clear(); + } + + @Test + public void givenEmployeeEntity_setEmails_shouldPersist() { + Employee employee = new Employee(); + + Email email = new Email(); + email.setAddress("example@email.com"); + email.setEmployee(employee); + + session.save(employee); + session.flush(); + session.clear(); + } + +} \ No newline at end of file From 86b279ee2090c2c16ce473fe585309460931e486 Mon Sep 17 00:00:00 2001 From: Krzysztof Majewski Date: Mon, 27 Aug 2018 08:43:12 +0200 Subject: [PATCH 6/6] add .java extension --- .../{JoinColumnIntegrationTest => JoinColumnIntegrationTest.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename hibernate5/src/test/java/com/baeldung/hibernate/joincolumn/{JoinColumnIntegrationTest => JoinColumnIntegrationTest.java} (100%) diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/joincolumn/JoinColumnIntegrationTest b/hibernate5/src/test/java/com/baeldung/hibernate/joincolumn/JoinColumnIntegrationTest.java similarity index 100% rename from hibernate5/src/test/java/com/baeldung/hibernate/joincolumn/JoinColumnIntegrationTest rename to hibernate5/src/test/java/com/baeldung/hibernate/joincolumn/JoinColumnIntegrationTest.java