diff --git a/src/main/java/fr/univ_amu/iut/dao/DAO.java b/src/main/java/fr/univ_amu/iut/dao/DAO.java index 2da6c8a..100246a 100644 --- a/src/main/java/fr/univ_amu/iut/dao/DAO.java +++ b/src/main/java/fr/univ_amu/iut/dao/DAO.java @@ -17,7 +17,7 @@ public interface DAO { * * @return liste de tous les objets contenus dans la base */ - List findAll() throws MalformedURLException; + List findAll(); /** * Permet de récupérer un objet via son ID diff --git a/src/main/java/fr/univ_amu/iut/dao/factory/DAOFactoryProducer.java b/src/main/java/fr/univ_amu/iut/dao/factory/DAOFactoryProducer.java index 8b1899e..f02fbc0 100644 --- a/src/main/java/fr/univ_amu/iut/dao/factory/DAOFactoryProducer.java +++ b/src/main/java/fr/univ_amu/iut/dao/factory/DAOFactoryProducer.java @@ -1,11 +1,13 @@ package fr.univ_amu.iut.dao.factory; import fr.univ_amu.iut.dao.jpa.DAOFactoryJPA; +import fr.univ_amu.iut.test.DAOFactoryTest; public class DAOFactoryProducer { public static DAOFactory getFactory(DAOType type) { return switch (type){ case JPA -> new DAOFactoryJPA(); + case TEST -> new DAOFactoryTest(); default -> throw new IllegalArgumentException(); }; } diff --git a/src/main/java/fr/univ_amu/iut/dao/factory/DAOType.java b/src/main/java/fr/univ_amu/iut/dao/factory/DAOType.java index c3665e3..b947d4d 100644 --- a/src/main/java/fr/univ_amu/iut/dao/factory/DAOType.java +++ b/src/main/java/fr/univ_amu/iut/dao/factory/DAOType.java @@ -1,5 +1,6 @@ package fr.univ_amu.iut.dao.factory; public enum DAOType { - JPA + JPA, + TEST } diff --git a/src/main/java/fr/univ_amu/iut/model/Ressource.java b/src/main/java/fr/univ_amu/iut/model/Ressource.java index daacb85..bddaae3 100644 --- a/src/main/java/fr/univ_amu/iut/model/Ressource.java +++ b/src/main/java/fr/univ_amu/iut/model/Ressource.java @@ -13,14 +13,11 @@ public class Ressource { @Id @GeneratedValue int id; - String nomRessource; - - @ManyToOne - TypeRessource typeRessource; + String typeRessource; URL lienRessource; - public Ressource(TypeRessource typeRessource, URL lienRessource) { + public Ressource(String typeRessource, URL lienRessource) { this.typeRessource = typeRessource; this.lienRessource = lienRessource; } @@ -29,7 +26,7 @@ public class Ressource { } - public TypeRessource getTypeRessource() { + public String getTypeRessource() { return typeRessource; } diff --git a/src/main/java/fr/univ_amu/iut/test/DAOAcademieTest.java b/src/main/java/fr/univ_amu/iut/test/DAOAcademieTest.java new file mode 100644 index 0000000..d8f95a1 --- /dev/null +++ b/src/main/java/fr/univ_amu/iut/test/DAOAcademieTest.java @@ -0,0 +1,37 @@ +package fr.univ_amu.iut.test; + +import fr.univ_amu.iut.dao.DAOAcademie; +import fr.univ_amu.iut.model.Academie; +import java.util.List; + +public class DAOAcademieTest implements DAOAcademie { + @Override + public boolean delete(Academie obj) { + return false; + } + + @Override + public List findAll() { + return null; + } + + @Override + public Academie getById(int id) { + return null; + } + + @Override + public boolean insert(Academie obj) { + return false; + } + + @Override + public boolean update(Academie obj) { + return false; + } + + @Override + public Academie getByCode(String code) { + return null; + } +} \ No newline at end of file diff --git a/src/main/java/fr/univ_amu/iut/test/DAODisciplineTest.java b/src/main/java/fr/univ_amu/iut/test/DAODisciplineTest.java new file mode 100644 index 0000000..1e8a7f1 --- /dev/null +++ b/src/main/java/fr/univ_amu/iut/test/DAODisciplineTest.java @@ -0,0 +1,32 @@ +package fr.univ_amu.iut.test; + +import fr.univ_amu.iut.dao.DAODiscipline; +import fr.univ_amu.iut.model.Discipline; +import java.util.List; + +public class DAODisciplineTest implements DAODiscipline { + @Override + public boolean delete(Discipline obj) { + return false; + } + + @Override + public List findAll() { + return null; + } + + @Override + public Discipline getById(int id) { + return null; + } + + @Override + public boolean insert(Discipline obj) { + return false; + } + + @Override + public boolean update(Discipline obj) { + return false; + } +} \ No newline at end of file diff --git a/src/main/java/fr/univ_amu/iut/test/DAOFactoryTest.java b/src/main/java/fr/univ_amu/iut/test/DAOFactoryTest.java new file mode 100644 index 0000000..f752641 --- /dev/null +++ b/src/main/java/fr/univ_amu/iut/test/DAOFactoryTest.java @@ -0,0 +1,42 @@ +package fr.univ_amu.iut.test; + +import fr.univ_amu.iut.dao.*; +import fr.univ_amu.iut.dao.factory.DAOFactory; + +public class DAOFactoryTest implements DAOFactory { + + @Override + public DAOAcademie createDAOAcademie() { + return null; + } + + @Override + public DAOActeur createDAOActeur() { + return null; + } + + @Override + public DAODiscipline createDAODiscipline() { + return null; + } + + @Override + public DAORegionAcademique createDAORegionAcademique() { + return null; + } + + @Override + public DAORessource createDAORessource() { + return new DAORessourceTest(); + } + + @Override + public DAOThematique createDAOThematique() { + return new DAOThematiqueTest(); + } + + @Override + public DAOUsage createDAOUsage() { + return null; + } +} diff --git a/src/main/java/fr/univ_amu/iut/DAORessourceTest.java b/src/main/java/fr/univ_amu/iut/test/DAORessourceTest.java similarity index 63% rename from src/main/java/fr/univ_amu/iut/DAORessourceTest.java rename to src/main/java/fr/univ_amu/iut/test/DAORessourceTest.java index dcc0284..c3884c2 100644 --- a/src/main/java/fr/univ_amu/iut/DAORessourceTest.java +++ b/src/main/java/fr/univ_amu/iut/test/DAORessourceTest.java @@ -1,8 +1,7 @@ -package fr.univ_amu.iut; +package fr.univ_amu.iut.test; import fr.univ_amu.iut.dao.DAORessource; import fr.univ_amu.iut.model.Ressource; -import fr.univ_amu.iut.model.TypeRessource; import java.net.MalformedURLException; import java.net.URL; @@ -16,12 +15,16 @@ public class DAORessourceTest implements DAORessource { } @Override - public List findAll() throws MalformedURLException { + public List findAll() { List liste = new ArrayList<>(); for (int i = 0; i < 12; i++){ - TypeRessource type = new TypeRessource(String.valueOf(i)); - URL url = new URL("http://google.com"); - Ressource ressource = new Ressource(type,url); + URL url = null; + try { + url = new URL("http://google.com"); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + Ressource ressource = new Ressource("bah google lol", url); liste.add(ressource); } return liste; @@ -33,8 +36,8 @@ public class DAORessourceTest implements DAORessource { } @Override - public Ressource insert(Ressource obj) { - return null; + public boolean insert(Ressource obj) { + return false; } @Override diff --git a/src/main/java/fr/univ_amu/iut/test/DAOThematiqueTest.java b/src/main/java/fr/univ_amu/iut/test/DAOThematiqueTest.java new file mode 100644 index 0000000..46d8564 --- /dev/null +++ b/src/main/java/fr/univ_amu/iut/test/DAOThematiqueTest.java @@ -0,0 +1,47 @@ +package fr.univ_amu.iut.test; + +import fr.univ_amu.iut.dao.DAOThematique; +import fr.univ_amu.iut.model.Thematique; + +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +public class DAOThematiqueTest implements DAOThematique { + @Override + public boolean delete(Thematique obj) { + return false; + } + + @Override + public List findAll() { + List liste = new ArrayList<>(); + for (int i = 0; i < 12; i++){ + URL url = null; + try { + url = new URL("http://google.com"); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + Thematique thematique = new Thematique(String.valueOf(i)); + liste.add(thematique); + } + return liste; + } + + @Override + public Thematique getById(int id) { + return null; + } + + @Override + public boolean insert(Thematique obj) { + return false; + } + + @Override + public boolean update(Thematique obj) { + return false; + } +} \ No newline at end of file