From eebeabbab5d24c5e82a53ef321043644f4360ad9 Mon Sep 17 00:00:00 2001 From: Bojnourdi Date: Tue, 18 Aug 2015 11:11:47 +0200 Subject: [PATCH] Code cleanup --- .../java/com/edf/gde/ejb/AttributesEJB.java | 14 +-------- .../src/java/com/edf/gde/ejb/ChunkEJB.java | 20 +++++-------- .../src/java/com/edf/gde/ejb/FileEJB.java | 29 +++++++------------ .../src/java/com/edf/gde/ejb/ProfileEJB.java | 6 +--- .../src/java/com/edf/gde/ejb/StudyEJB.java | 29 +++++++------------ .../src/java/com/edf/gde/ejb/UserEJB.java | 4 +-- .../src/java/com/edf/gde/entities/Study.java | 3 ++ projects/GDE_App/src/GDE_DB_Init.sql | 3 +- 8 files changed, 36 insertions(+), 72 deletions(-) diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/AttributesEJB.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/AttributesEJB.java index 91ad861..5a4e007 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/AttributesEJB.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/AttributesEJB.java @@ -18,80 +18,68 @@ import javax.persistence.PersistenceContext; */ @Stateless @LocalBean -public class AttributesEJB implements AttributeDao { +public class AttributesEJB { @PersistenceContext(unitName = "GDE-ejbPU") private EntityManager em; /* Attributes */ - @Override public AttributeTO createAttribute(AttributeTO ato) { AttributeDao dao = new AttributeDaoImpl(em); return dao.createAttribute(ato); } - @Override public void deleteAttribute(long attributeId) { AttributeDao dao = new AttributeDaoImpl(em); dao.deleteAttribute(attributeId); } - @Override public AttributeTO updateAttribute(AttributeTO ato) { AttributeDao dao = new AttributeDaoImpl(em); return dao.updateAttribute(ato); } - @Override public AttributeTO readAttribute(long attributeId) { AttributeDao dao = new AttributeDaoImpl(em); return dao.readAttribute(attributeId); } - @Override public AttributeTO findById(long id) { AttributeDao dao = new AttributeDaoImpl(em); return dao.findById(id); } - @Override public AttributeTO findByName(String name) { AttributeDao dao = new AttributeDaoImpl(em); return dao.findByName(name); } - @Override public AttributeTO findByType(String type) { AttributeDao dao = new AttributeDaoImpl(em); return dao.findByType(type); } - @Override public AttributeTO findByValue(String value) { AttributeDao dao = new AttributeDaoImpl(em); return dao.findByValue(value); } /* Attributes Groups */ - @Override public AttributeGroupTO createAttributeGroup(AttributeGroupTO agto) { AttributeDao dao = new AttributeDaoImpl(em); return dao.createAttributeGroup(agto); } - @Override public void deleteAttributeGroup(long id) { AttributeDao dao = new AttributeDaoImpl(em); dao.deleteAttributeGroup(id); } - @Override public AttributeGroupTO updateAttributeGroup(AttributeGroupTO agto) { AttributeDao dao = new AttributeDaoImpl(em); return dao.updateAttributeGroup(agto); } - @Override public AttributeGroupTO readAttributeGroup(long groupId) { AttributeDao dao = new AttributeDaoImpl(em); return dao.readAttributeGroup(groupId); diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/ChunkEJB.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/ChunkEJB.java index 3f899cf..51ba9bd 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/ChunkEJB.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/ChunkEJB.java @@ -17,44 +17,38 @@ import javax.persistence.PersistenceContext; */ @Stateless @LocalBean -public class ChunkEJB implements ChunkDao { +public class ChunkEJB { @PersistenceContext(unitName = "GDE-ejbPU") private EntityManager em; - @Override public ChunkTO createChunk(ChunkTO cto) { - ChunkDaoImpl dao = new ChunkDaoImpl(em); + ChunkDao dao = new ChunkDaoImpl(em); return dao.createChunk(cto); } - @Override public void deleteChunk(ChunkTO cto) { - ChunkDaoImpl dao = new ChunkDaoImpl(em); + ChunkDao dao = new ChunkDaoImpl(em); dao.deleteChunk(cto); } - @Override public ChunkTO updateChunk(ChunkTO cto) { - ChunkDaoImpl dao = new ChunkDaoImpl(em); + ChunkDao dao = new ChunkDaoImpl(em); return dao.updateChunk(cto); } - @Override public ChunkTO findChunk(ChunkTO cto) { - ChunkDaoImpl dao = new ChunkDaoImpl(em); + ChunkDao dao = new ChunkDaoImpl(em); return dao.findChunk(cto); } - @Override public ChunkTO findById(long id) { - ChunkDaoImpl dao = new ChunkDaoImpl(em); + ChunkDao dao = new ChunkDaoImpl(em); return dao.findById(id); } - @Override public ChunkTO findByFileId(long fileId) { - ChunkDaoImpl dao = new ChunkDaoImpl(em); + ChunkDao dao = new ChunkDaoImpl(em); return dao.findByFileId(fileId); } diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/FileEJB.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/FileEJB.java index 2a77598..134e5f2 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/FileEJB.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/FileEJB.java @@ -18,62 +18,53 @@ import javax.persistence.PersistenceContext; */ @Stateless @LocalBean -public class FileEJB implements FileDao { +public class FileEJB { @PersistenceContext(unitName = "GDE-ejbPU") private EntityManager em; - @Override public FileTO createFile(FileTO fto) { - FileDaoImpl dao = new FileDaoImpl(em); + FileDao dao = new FileDaoImpl(em); return dao.createFile(fto); } - @Override public void deleteFile(FileTO fto) { - FileDaoImpl dao = new FileDaoImpl(em); + FileDao dao = new FileDaoImpl(em); dao.deleteFile(fto); } - @Override public FileTO updateFile(FileTO fto) { - FileDaoImpl dao = new FileDaoImpl(em); + FileDao dao = new FileDaoImpl(em); return dao.updateFile(fto); } - @Override public FileTO findFile(FileTO fto) { - FileDaoImpl dao = new FileDaoImpl(em); + FileDao dao = new FileDaoImpl(em); return dao.findFile(fto); } - @Override public FileTO findById(long id) { - FileDaoImpl dao = new FileDaoImpl(em); + FileDao dao = new FileDaoImpl(em); return dao.findById(id); } - @Override public FileTO findByName(String name) { - FileDaoImpl dao = new FileDaoImpl(em); + FileDao dao = new FileDaoImpl(em); return dao.findByName(name); } - @Override public FileTO findByCreationDate(Date creationDate) { - FileDaoImpl dao = new FileDaoImpl(em); + FileDao dao = new FileDaoImpl(em); return dao.findByCreationDate(creationDate); } - @Override public FileTO findByUpdateDate(Date updateDate) { - FileDaoImpl dao = new FileDaoImpl(em); + FileDao dao = new FileDaoImpl(em); return dao.findByUpdateDate(updateDate); } - @Override public FileTO findByDeletionDate(Date deletionDate) { - FileDaoImpl dao = new FileDaoImpl(em); + FileDao dao = new FileDaoImpl(em); return dao.findByDeletionDate(deletionDate); } diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/ProfileEJB.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/ProfileEJB.java index a93f91d..d8d720b 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/ProfileEJB.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/ProfileEJB.java @@ -18,7 +18,7 @@ import javax.persistence.PersistenceContext; */ @Stateless @LocalBean -public class ProfileEJB implements ProfileDao { +public class ProfileEJB { @PersistenceContext(unitName = "GDE-ejbPU") private EntityManager em; @@ -43,25 +43,21 @@ public class ProfileEJB implements ProfileDao { return dao.updateProfile(profileTO); } - @Override public ProfileAttributeTO createProfileAttribute(ProfileAttributeTO attributeTO) { ProfileDao dao = new ProfileDaoImpl(em); return dao.createProfileAttribute(attributeTO); } - @Override public void deleteProfileAttribute(long id) { ProfileDao dao = new ProfileDaoImpl(em); dao.deleteProfileAttribute(id); } - @Override public ProfileAttributeTO readProfileAttribute(long id) { ProfileDao dao = new ProfileDaoImpl(em); return dao.readProfileAttribute(id); } - @Override public ProfileAttributeTO updateProfileAttribute(ProfileAttributeTO attributeTO) { ProfileDao dao = new ProfileDaoImpl(em); return dao.updateProfileAttribute(attributeTO); diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/StudyEJB.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/StudyEJB.java index e9bb54e..1215792 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/StudyEJB.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/StudyEJB.java @@ -18,62 +18,53 @@ import javax.persistence.PersistenceContext; */ @Stateless @LocalBean -public class StudyEJB implements StudyDao { +public class StudyEJB { @PersistenceContext(unitName = "GDE-ejbPU") private EntityManager em; - @Override public StudyTO createStudy(StudyTO sto) { - StudyDaoImpl dao = new StudyDaoImpl(em); + StudyDao dao = new StudyDaoImpl(em); return dao.createStudy(sto); } - @Override public void deleteStudy(long studyId) { - StudyDaoImpl dao = new StudyDaoImpl(em); + StudyDao dao = new StudyDaoImpl(em); dao.deleteStudy(studyId); } - @Override public StudyTO updateStudy(StudyTO sto) { - StudyDaoImpl dao = new StudyDaoImpl(em); + StudyDao dao = new StudyDaoImpl(em); return dao.updateStudy(sto); } - @Override public StudyTO findStudy(StudyTO sto) { - StudyDaoImpl dao = new StudyDaoImpl(em); + StudyDao dao = new StudyDaoImpl(em); return dao.findStudy(sto); } - @Override public StudyTO findById(long id) { - StudyDaoImpl dao = new StudyDaoImpl(em); + StudyDao dao = new StudyDaoImpl(em); return dao.findById(id); } - @Override public StudyTO findByName(String name) { - StudyDaoImpl dao = new StudyDaoImpl(em); + StudyDao dao = new StudyDaoImpl(em); return dao.findByName(name); } - @Override public StudyTO findByCreationDate(Date creationDate) { - StudyDaoImpl dao = new StudyDaoImpl(em); + StudyDao dao = new StudyDaoImpl(em); return dao.findByCreationDate(creationDate); } - @Override public StudyTO findByUpdateDate(Date updateDate) { - StudyDaoImpl dao = new StudyDaoImpl(em); + StudyDao dao = new StudyDaoImpl(em); return dao.findByUpdateDate(updateDate); } - @Override public StudyTO findByDeletionDate(Date deletionDate) { - StudyDaoImpl dao = new StudyDaoImpl(em); + StudyDao dao = new StudyDaoImpl(em); return dao.findByDeletionDate(deletionDate); } diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/UserEJB.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/UserEJB.java index 986d6a9..65e61af 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/UserEJB.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/UserEJB.java @@ -16,11 +16,11 @@ import javax.persistence.PersistenceContext; */ @Stateless @LocalBean -public class UserEJB implements UserDao { +public class UserEJB { @PersistenceContext(unitName = "GDE-ejbPU") private EntityManager em; - + /** * Create a new user * diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Study.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Study.java index e03e385..bfe0078 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Study.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Study.java @@ -69,6 +69,9 @@ public class Study implements Serializable { private Long profileId; @Column(name ="locked") private boolean locked; + @Column(name ="lock_owner") + private long lockOwner; + public Study() { } diff --git a/projects/GDE_App/src/GDE_DB_Init.sql b/projects/GDE_App/src/GDE_DB_Init.sql index c4d0c01..ce6a47c 100644 --- a/projects/GDE_App/src/GDE_DB_Init.sql +++ b/projects/GDE_App/src/GDE_DB_Init.sql @@ -110,7 +110,8 @@ CREATE TABLE study ( deletion_date timestamp, attribute_group_id bigint REFERENCES attribute_group (id), profile_id bigint REFERENCES profile (id), - locked boolean + locked boolean, + lock_owner bigint references users(id) ); /* PROFILES */ -- 2.39.2