Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion SpringMVS_Hibernate_GoogleAPI_MySQL.iml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
<configuration>
<datasource-map>
<unit-entry name="hibernate.cfg.xml" />
<unit-entry name="hibernate4AnnotatedSessionFactory" value="aa4de0a8-6e43-4523-b06d-8a6cc189e8e4" />
</datasource-map>
<naming-strategy-map />
<deploymentDescriptor name="hibernate.cfg.xml" url="file://$MODULE_DIR$/src/main/resources/hibernate.cfg.xml" />
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/entity/PlacePoint.java
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/entity/Tag.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ public class Tag {
@Column(name = "tag_discription")
private String tagDiscripton;

/* @OneToMany(mappedBy = "tag",cascade = CascadeType.ALL)
private Set<UserExpensesTag> userExpensesTagSet = new HashSet<UserExpensesTag>(0);*/
@OneToMany(mappedBy = "tag",cascade = CascadeType.ALL)
private Set<UserExpensesTag> userExpensesTagSet = new HashSet<UserExpensesTag>(0);

public Tag() {
}
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/entity/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<UserExpenses> userExpensesSet = new HashSet<UserExpenses>(0);
*/
public User() {
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/entity/UserExpenses.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ 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;

@OneToMany(fetch = FetchType.LAZY, mappedBy = "userExpenses",cascade = CascadeType.ALL)
private Set<PlacePoint> placePointSet = new HashSet<PlacePoint>(0);

@OneToMany(fetch = FetchType.LAZY, mappedBy = "userExpenses", cascade = CascadeType.ALL)
private Set<UserExpensesTag> userExpensesTags = new HashSet<UserExpensesTag>(0);*/
private Set<UserExpensesTag> userExpensesTags = new HashSet<UserExpensesTag>(0);

public UserExpenses() {
}
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/com/entity/UserExpensesTag.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,13 @@ 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;

@ManyToOne
@JoinColumn(name = "TAG_NAME_FK")
private Tag tag;
*/

public UserExpensesTag() {
}
Expand Down