From 8af44d145d44ab9c3e2b3bd6d0169c93e17c0a9c Mon Sep 17 00:00:00 2001 From: Roxane Date: Mon, 26 Feb 2024 16:19:57 +0100 Subject: [PATCH] adaptation to my work --- .../WebService/controller/CollectionControlleur.java | 2 ++ .../{Controller => controller}/TeacherController.java | 8 ++------ .../SAE/ApiREST/WebService/{Model => model}/Teacher.java | 2 +- .../ApiREST/WebService/service/ICollectionService.java | 5 +++++ .../WebService/{Service => service}/ITeacherService.java | 6 +++--- .../ApiREST/WebService/service/StubCollectionService.java | 3 --- .../{Service => service}/TeacherServiceStub.java | 8 ++++---- 7 files changed, 17 insertions(+), 17 deletions(-) rename WebService/src/main/java/SAE/ApiREST/WebService/{Controller => controller}/TeacherController.java (65%) rename WebService/src/main/java/SAE/ApiREST/WebService/{Model => model}/Teacher.java (96%) rename WebService/src/main/java/SAE/ApiREST/WebService/{Service => service}/ITeacherService.java (73%) rename WebService/src/main/java/SAE/ApiREST/WebService/{Service => service}/TeacherServiceStub.java (89%) diff --git a/WebService/src/main/java/SAE/ApiREST/WebService/controller/CollectionControlleur.java b/WebService/src/main/java/SAE/ApiREST/WebService/controller/CollectionControlleur.java index 6060b3f..d0a6f3d 100644 --- a/WebService/src/main/java/SAE/ApiREST/WebService/controller/CollectionControlleur.java +++ b/WebService/src/main/java/SAE/ApiREST/WebService/controller/CollectionControlleur.java @@ -1,3 +1,5 @@ +package SAE.ApiREST.WebService.controller; + @org.springframework.stereotype.Controller @Controller diff --git a/WebService/src/main/java/SAE/ApiREST/WebService/Controller/TeacherController.java b/WebService/src/main/java/SAE/ApiREST/WebService/controller/TeacherController.java similarity index 65% rename from WebService/src/main/java/SAE/ApiREST/WebService/Controller/TeacherController.java rename to WebService/src/main/java/SAE/ApiREST/WebService/controller/TeacherController.java index 7c60452..0c42fb5 100644 --- a/WebService/src/main/java/SAE/ApiREST/WebService/Controller/TeacherController.java +++ b/WebService/src/main/java/SAE/ApiREST/WebService/controller/TeacherController.java @@ -1,14 +1,10 @@ -package SAE.ApiREST.WebService.Controller; +package SAE.ApiREST.WebService.controller; -import SAE.ApiREST.WebService.Model.Teacher; -import SAE.ApiREST.WebService.Service.ITeacherService; +import SAE.ApiREST.WebService.service.ITeacherService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; - @Controller @RequestMapping("/ProfWebService") public class TeacherController { diff --git a/WebService/src/main/java/SAE/ApiREST/WebService/Model/Teacher.java b/WebService/src/main/java/SAE/ApiREST/WebService/model/Teacher.java similarity index 96% rename from WebService/src/main/java/SAE/ApiREST/WebService/Model/Teacher.java rename to WebService/src/main/java/SAE/ApiREST/WebService/model/Teacher.java index 5b8653b..404b0f6 100644 --- a/WebService/src/main/java/SAE/ApiREST/WebService/Model/Teacher.java +++ b/WebService/src/main/java/SAE/ApiREST/WebService/model/Teacher.java @@ -1,4 +1,4 @@ -package SAE.ApiREST.WebService.Model; +package SAE.ApiREST.WebService.model; import jakarta.persistence.Entity; import jakarta.persistence.Id; diff --git a/WebService/src/main/java/SAE/ApiREST/WebService/service/ICollectionService.java b/WebService/src/main/java/SAE/ApiREST/WebService/service/ICollectionService.java index 6b82362..2310089 100644 --- a/WebService/src/main/java/SAE/ApiREST/WebService/service/ICollectionService.java +++ b/WebService/src/main/java/SAE/ApiREST/WebService/service/ICollectionService.java @@ -1,3 +1,8 @@ +package SAE.ApiREST.WebService.service; + +import java.util.Collection; +import java.util.List; + public interface ICollectionService{ public List getAllCollections(); public Collection getCollectionById(long isbn); diff --git a/WebService/src/main/java/SAE/ApiREST/WebService/Service/ITeacherService.java b/WebService/src/main/java/SAE/ApiREST/WebService/service/ITeacherService.java similarity index 73% rename from WebService/src/main/java/SAE/ApiREST/WebService/Service/ITeacherService.java rename to WebService/src/main/java/SAE/ApiREST/WebService/service/ITeacherService.java index 549ce1a..182f3b6 100644 --- a/WebService/src/main/java/SAE/ApiREST/WebService/Service/ITeacherService.java +++ b/WebService/src/main/java/SAE/ApiREST/WebService/service/ITeacherService.java @@ -1,6 +1,6 @@ -package SAE.ApiREST.WebService.Service; +package SAE.ApiREST.WebService.service; -import SAE.ApiREST.WebService.Model.Teacher; +import SAE.ApiREST.WebService.model.Teacher; import java.time.LocalDate; import java.util.List; @@ -15,7 +15,7 @@ public interface ITeacherService { public Teacher getTeacherByUsername(String username); public Teacher getTeacherByMail(String mail); public Teacher getTeacherByDate(LocalDate date); - public List addTeacher(int id, LocalDate date, String mail, String username); + public List addTeacher(Teacher t); public List deleteTeacher(int id); } diff --git a/WebService/src/main/java/SAE/ApiREST/WebService/service/StubCollectionService.java b/WebService/src/main/java/SAE/ApiREST/WebService/service/StubCollectionService.java index a335f5f..cc90b58 100644 --- a/WebService/src/main/java/SAE/ApiREST/WebService/service/StubCollectionService.java +++ b/WebService/src/main/java/SAE/ApiREST/WebService/service/StubCollectionService.java @@ -1,13 +1,10 @@ package SAE.ApiREST.WebService.service; -import java.sql.Date; import java.util.ArrayList; import java.util.List; import org.springframework.stereotype.Service; -import SAE.ApiREST.WebService.model.Article; - @Service public class CollectionService implements ICollectionService { private ArrayList collections; diff --git a/WebService/src/main/java/SAE/ApiREST/WebService/Service/TeacherServiceStub.java b/WebService/src/main/java/SAE/ApiREST/WebService/service/TeacherServiceStub.java similarity index 89% rename from WebService/src/main/java/SAE/ApiREST/WebService/Service/TeacherServiceStub.java rename to WebService/src/main/java/SAE/ApiREST/WebService/service/TeacherServiceStub.java index 6aceee6..ee0660d 100644 --- a/WebService/src/main/java/SAE/ApiREST/WebService/Service/TeacherServiceStub.java +++ b/WebService/src/main/java/SAE/ApiREST/WebService/service/TeacherServiceStub.java @@ -1,6 +1,6 @@ -package SAE.ApiREST.WebService.Service; +package SAE.ApiREST.WebService.service; -import SAE.ApiREST.WebService.Model.Teacher; +import SAE.ApiREST.WebService.model.Teacher; import org.springframework.stereotype.Service; import java.time.LocalDate; @@ -46,9 +46,9 @@ public class TeacherServiceStub implements ITeacherService { } @Override - public List addTeacher(int id, LocalDate date, String mail, String username) { + public List addTeacher(Teacher t) { List lteach = new ArrayList(); - lteach.add(new Teacher(id,date,mail,username)); + lteach.add(t); return lteach; }