From d17ebba00a946e143639867d4aecdc2ef93afb26 Mon Sep 17 00:00:00 2001 From: Alexandr Date: Sun, 4 Jun 2017 21:05:40 +0300 Subject: [PATCH] create entity connection --- SpringMVS_Hibernate_GoogleAPI_MySQL.iml | 1 - src/main/java/com/entity/PlacePoint.java | 4 ++-- src/main/java/com/entity/Tag.java | 4 ++-- src/main/java/com/entity/User.java | 3 +-- src/main/java/com/entity/UserExpenses.java | 4 ++-- src/main/java/com/entity/UserExpensesTag.java | 2 -- 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/SpringMVS_Hibernate_GoogleAPI_MySQL.iml b/SpringMVS_Hibernate_GoogleAPI_MySQL.iml index 1af809f..765b3b8 100644 --- a/SpringMVS_Hibernate_GoogleAPI_MySQL.iml +++ b/SpringMVS_Hibernate_GoogleAPI_MySQL.iml @@ -22,7 +22,6 @@ - diff --git a/src/main/java/com/entity/PlacePoint.java b/src/main/java/com/entity/PlacePoint.java index eab8576..70a7d46 100644 --- a/src/main/java/com/entity/PlacePoint.java +++ b/src/main/java/com/entity/PlacePoint.java @@ -23,9 +23,9 @@ public class PlacePoint { @Column(name = "placepoint_address") private String placePointAddress; - /* @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "PLACEPOINT_ID") - private UserExpenses userExpenses;*/ + private UserExpenses userExpenses; public PlacePoint() { } diff --git a/src/main/java/com/entity/Tag.java b/src/main/java/com/entity/Tag.java index 8010bb5..aa30ee5 100644 --- a/src/main/java/com/entity/Tag.java +++ b/src/main/java/com/entity/Tag.java @@ -21,8 +21,8 @@ public class Tag { @Column(name = "tag_discription") private String tagDiscripton; - /* @OneToMany(mappedBy = "tag",cascade = CascadeType.ALL) - private Set userExpensesTagSet = new HashSet(0);*/ + @OneToMany(mappedBy = "tag",cascade = CascadeType.ALL) + private Set userExpensesTagSet = new HashSet(0); public Tag() { } diff --git a/src/main/java/com/entity/User.java b/src/main/java/com/entity/User.java index 32f6cea..cf3ce94 100644 --- a/src/main/java/com/entity/User.java +++ b/src/main/java/com/entity/User.java @@ -25,9 +25,8 @@ public class User { @Column(name = "user_birthdate") private Date user_birthday; - /* @OneToMany(fetch = FetchType.LAZY, mappedBy = "user",cascade = CascadeType.ALL) + @OneToMany(fetch = FetchType.LAZY, mappedBy = "user",cascade = CascadeType.ALL) private Set userExpensesSet = new HashSet(0); -*/ public User() { } diff --git a/src/main/java/com/entity/UserExpenses.java b/src/main/java/com/entity/UserExpenses.java index 033cad9..8c339fc 100644 --- a/src/main/java/com/entity/UserExpenses.java +++ b/src/main/java/com/entity/UserExpenses.java @@ -28,7 +28,7 @@ public class UserExpenses { @Column(name = "userexperses_date") private Date userExpensesDate; - /*@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) + @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) @JoinColumn(name = "USER_PHONE_FK", nullable = false) private User user; @@ -36,7 +36,7 @@ public class UserExpenses { private Set placePointSet = new HashSet(0); @OneToMany(fetch = FetchType.LAZY, mappedBy = "userExpenses", cascade = CascadeType.ALL) - private Set userExpensesTags = new HashSet(0);*/ + private Set userExpensesTags = new HashSet(0); public UserExpenses() { } diff --git a/src/main/java/com/entity/UserExpensesTag.java b/src/main/java/com/entity/UserExpensesTag.java index 88ed45f..5abb52d 100644 --- a/src/main/java/com/entity/UserExpensesTag.java +++ b/src/main/java/com/entity/UserExpensesTag.java @@ -16,7 +16,6 @@ public class UserExpensesTag { @Column(name = "user_expenses_id_fk") private int userExpensesIdFk; -/* @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) @JoinColumn(name = "USER_EXPENSES_ID_FK") private UserExpenses userExpenses; @@ -24,7 +23,6 @@ public class UserExpensesTag { @ManyToOne @JoinColumn(name = "TAG_NAME_FK") private Tag tag; -*/ public UserExpensesTag() { }