Skip to content

Commit 94e42bd

Browse files
author
Hattinger04
committed
using @DaTa
1 parent b1abac0 commit 94e42bd

File tree

5 files changed

+22
-37
lines changed

5 files changed

+22
-37
lines changed
Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
package io.github.Hattinger04.course.model;
22

3+
import java.util.Set;
4+
35
import javax.persistence.Entity;
46
import javax.persistence.Table;
57

6-
78
import lombok.AllArgsConstructor;
8-
import lombok.Getter;
9-
import lombok.Setter;
9+
import lombok.Data;
1010

1111
//@Entity
1212
//@Table(name = "student")
13+
@Data
1314
@AllArgsConstructor
1415
public class Student {
1516

16-
@Getter @Setter
1717
private Integer id; // TODO: primary_key
1818

19-
@Getter @Setter
20-
private String name; // TODO: unique
19+
private Integer user_id; // TODO: FK
2120

2221
}
Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
package io.github.Hattinger04.course.model;
22

3+
import java.util.Set;
4+
35
import javax.persistence.Entity;
46
import javax.persistence.Table;
57

6-
78
import lombok.AllArgsConstructor;
8-
import lombok.Getter;
9-
import lombok.Setter;
9+
import lombok.Data;
1010

1111
//@Entity
1212
//@Table(name = "teacher")
13+
@Data
1314
@AllArgsConstructor
1415
public class Teacher {
1516

16-
@Getter @Setter
1717
private Integer id; // TODO: primary_key
1818

19-
@Getter @Setter
20-
private String name; // TODO: unique
19+
private Integer user_id; // TODO: FK
2120

2221
}

src/main/java/io/github/Hattinger04/course/model/course/Course.java

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,17 @@
22

33
import java.util.Set;
44

5-
import javax.persistence.Column;
6-
import javax.persistence.Entity;
7-
import javax.persistence.GeneratedValue;
8-
import javax.persistence.GenerationType;
9-
import javax.persistence.Id;
10-
import javax.persistence.Table;
5+
import javax.persistence.CascadeType;
6+
import javax.persistence.JoinColumn;
7+
import javax.persistence.JoinTable;
8+
import javax.persistence.ManyToMany;
119

12-
13-
import io.github.Hattinger04.user.model.User;
1410
import lombok.AllArgsConstructor;
15-
import lombok.Getter;
16-
import lombok.Setter;
11+
import lombok.Data;
1712

1813
//@Entity
1914
//@Table(name = "course")
15+
@Data
2016
@AllArgsConstructor
2117
public class Course {
2218

@@ -27,17 +23,16 @@ public Course(String name) {
2723
// @Id
2824
// @GeneratedValue(strategy = GenerationType.IDENTITY)
2925
// @Column(name = "user_id")
30-
@Getter @Setter
3126
private Integer id; // TODO: primary_key
3227

33-
@Getter @Setter
3428
private String name; // TODO: unique
3529

3630
/*
3731
Not tested!
3832
Connection between course and user (n - m solution)
33+
*/
3934
@ManyToMany(cascade = CascadeType.MERGE)
4035
@JoinTable(name = "user_course", joinColumns = @JoinColumn(name = "user_id"), inverseJoinColumns = @JoinColumn(name = "course_id"))
4136
private Set<Course> courses;
42-
*/
37+
4338
}

src/main/java/io/github/Hattinger04/course/model/exercise/Exercise.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
import javax.persistence.Table;
55

66
import lombok.AllArgsConstructor;
7-
import lombok.Getter;
8-
import lombok.Setter;
7+
import lombok.Data;
98

109
//@Entity
1110
//@Table(name = "exercise")
11+
@Data
1212
@AllArgsConstructor
1313
public class Exercise {
1414

@@ -17,16 +17,11 @@ public Exercise(Integer course_id, String name) {
1717
this.name = name;
1818
}
1919

20-
@Getter @Setter
2120
private Integer id; // TODO: primary_key
2221

23-
@Getter @Setter
2422
private String name; // TODO: unique
2523

26-
@Getter @Setter
2724
private String text;
2825

29-
@Getter @Setter
3026
private Integer course_id; // TODO: FK
31-
3227
}
Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package io.github.Hattinger04.course.model.solution;
22

33
import lombok.AllArgsConstructor;
4-
import lombok.Getter;
5-
import lombok.Setter;
4+
import lombok.Data;
65

76
//@Entity
87
//@Table(name = "Solution")
8+
@Data
99
@AllArgsConstructor
1010
public class Solution {
1111

@@ -14,13 +14,10 @@ public Solution(Integer exercise_id, String text) {
1414
this.text = text;
1515
}
1616

17-
@Getter @Setter
1817
private Integer id; // TODO: primary_key
1918

20-
@Getter @Setter
2119
private String text;
2220

23-
@Getter @Setter
2421
private Integer exercise_id; // TODO: FK
2522

2623
}

0 commit comments

Comments
 (0)