From c07a3e04248bc506688da18525d17427551f72eb Mon Sep 17 00:00:00 2001 From: Smejky338 Date: Sun, 27 Mar 2022 16:16:52 +0200 Subject: [PATCH 1/3] ReportDao switch to CrudRepository --- .../group7/secretservice/dao/ReportDao.java | 12 ++--- .../secretservice/dao/ReportDaoImpl.java | 44 ------------------- 2 files changed, 3 insertions(+), 53 deletions(-) delete mode 100644 src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/ReportDaoImpl.java diff --git a/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/ReportDao.java b/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/ReportDao.java index c1914c4c..9f05f251 100644 --- a/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/ReportDao.java +++ b/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/ReportDao.java @@ -1,19 +1,13 @@ package cz.fi.muni.pa165.seminar4.group7.secretservice.dao; +import cz.fi.muni.pa165.seminar4.group7.secretservice.entity.AgentAssignment; import cz.fi.muni.pa165.seminar4.group7.secretservice.entity.Report; +import org.springframework.data.repository.CrudRepository; import java.util.List; /** * @author Jan Smejkal */ -public interface ReportDao { - - void create(Report report); - - List findAll(); - - Report findById(long id); - - void remove(Report report); +public interface ReportDao extends CrudRepository { } diff --git a/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/ReportDaoImpl.java b/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/ReportDaoImpl.java deleted file mode 100644 index f583c47c..00000000 --- a/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/ReportDaoImpl.java +++ /dev/null @@ -1,44 +0,0 @@ -package cz.fi.muni.pa165.seminar4.group7.secretservice.dao; - -import cz.fi.muni.pa165.seminar4.group7.secretservice.entity.Report; - -import java.util.List; -import org.springframework.stereotype.Repository; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; - - -/** - * @author Jan Smejkal - */ -@Repository -public class ReportDaoImpl implements ReportDao { - - @PersistenceContext - private EntityManager em; - - public ReportDaoImpl(EntityManager em) { - this.em = em; - } - - @Override - public void create(Report report) { - em.persist(report); - } - - @Override - public List findAll() { - return em.createQuery("select r from Report r", Report.class).getResultList(); - } - - @Override - public Report findById(long id) { - return em.find(Report.class, id); - } - - @Override - public void remove(Report report) { - em.remove(report); - } - -} \ No newline at end of file -- GitLab From eac73150618a3ba9e8d1611f5a11a14abee03b88 Mon Sep 17 00:00:00 2001 From: Smejky338 Date: Sun, 27 Mar 2022 16:17:31 +0200 Subject: [PATCH 2/3] Move Getter and Setter for the whole class --- .../seminar4/group7/secretservice/entity/Report.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/Report.java b/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/Report.java index c73949b3..4dcd92e4 100644 --- a/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/Report.java +++ b/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/Report.java @@ -9,26 +9,20 @@ import javax.persistence.*; * @author Jan Smejkal */ @Entity +@Getter +@Setter public class Report { @Id @Column(name = "id", nullable = false) @GeneratedValue(strategy = GenerationType.IDENTITY) - @Getter - @Setter private Long id; - @Getter - @Setter private String report; @OneToOne - @Setter - @Getter private PerformanceEvaluation performanceEvaluation; @OneToOne(mappedBy = "report") - @Getter - @Setter private AgentAssignment agentAssignment; public Report() {} -- GitLab From b165b4f7886c5ab01e90bf2ebe84d025a9dcdcf3 Mon Sep 17 00:00:00 2001 From: Smejky338 Date: Sun, 27 Mar 2022 17:01:11 +0200 Subject: [PATCH 3/3] Move Getter and Setter for the whole class, add accessor --- .../secretservice/entity/PerformanceEvaluation.java | 12 ++++-------- .../seminar4/group7/secretservice/entity/Report.java | 2 ++ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/PerformanceEvaluation.java b/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/PerformanceEvaluation.java index 7865e33b..dd5fc1f4 100644 --- a/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/PerformanceEvaluation.java +++ b/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/PerformanceEvaluation.java @@ -2,6 +2,7 @@ package cz.fi.muni.pa165.seminar4.group7.secretservice.entity; import lombok.Getter; import lombok.Setter; +import lombok.experimental.Accessors; import javax.persistence.*; @@ -9,25 +10,20 @@ import javax.persistence.*; * @author Jan Smejkal */ @Entity +@Getter +@Setter +@Accessors(chain = true) public class PerformanceEvaluation { @Id @Column(name = "id", nullable = false) @GeneratedValue(strategy = GenerationType.IDENTITY) - @Getter - @Setter private Long id; @ManyToOne - @Getter - @Setter private Report report; - @Getter - @Setter private String evaluation; - @Getter - @Setter private int rating; public PerformanceEvaluation() { diff --git a/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/Report.java b/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/Report.java index 4dcd92e4..6fa12e79 100644 --- a/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/Report.java +++ b/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/Report.java @@ -2,6 +2,7 @@ package cz.fi.muni.pa165.seminar4.group7.secretservice.entity; import lombok.Getter; import lombok.Setter; +import lombok.experimental.Accessors; import javax.persistence.*; @@ -11,6 +12,7 @@ import javax.persistence.*; @Entity @Getter @Setter +@Accessors(chain = true) public class Report { @Id @Column(name = "id", nullable = false) -- GitLab