From db3713f95528ad49c5d93c75f1c507dd89addbb8 Mon Sep 17 00:00:00 2001 From: killerber4t Date: Fri, 6 Mar 2020 13:19:03 +0100 Subject: [PATCH 1/7] update styleguide --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4919f8f..15f22d4 100644 --- a/build.gradle +++ b/build.gradle @@ -58,7 +58,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.keycloak:keycloak-spring-boot-starter:9.0.0' implementation 'org.keycloak.bom:keycloak-adapter-bom:3.3.0.Final' - implementation 'mops:styleguide:2.0.1' + implementation 'mops:styleguide:2.1.0' compile group: 'io.springfox', name: 'springfox-swagger2', version: '2.7.0' compile group: 'io.springfox', name: 'springfox-swagger-ui', version: '2.7.0' compileOnly 'org.projectlombok:lombok' From 2ba81765006f656db2ca1c1394e783a2aca8f5c6 Mon Sep 17 00:00:00 2001 From: killerber4t Date: Fri, 6 Mar 2020 13:28:09 +0100 Subject: [PATCH 2/7] add GruppenService and EventRepository and Event object --- src/main/java/mops/gruppen2/DTO/Event.java | 4 ++++ .../java/mops/gruppen2/entities/GruppeRepository.java | 6 ------ .../mops/gruppen2/entities/TeilnehmerRepository.java | 6 ------ .../mops/gruppen2/repositories/EventRepository.java | 7 +++++++ .../java/mops/gruppen2/services/GruppenService.java | 10 ++++++++++ 5 files changed, 21 insertions(+), 12 deletions(-) create mode 100644 src/main/java/mops/gruppen2/DTO/Event.java delete mode 100644 src/main/java/mops/gruppen2/entities/GruppeRepository.java delete mode 100644 src/main/java/mops/gruppen2/entities/TeilnehmerRepository.java create mode 100644 src/main/java/mops/gruppen2/repositories/EventRepository.java create mode 100644 src/main/java/mops/gruppen2/services/GruppenService.java diff --git a/src/main/java/mops/gruppen2/DTO/Event.java b/src/main/java/mops/gruppen2/DTO/Event.java new file mode 100644 index 0000000..2876163 --- /dev/null +++ b/src/main/java/mops/gruppen2/DTO/Event.java @@ -0,0 +1,4 @@ +package mops.gruppen2.DTO; + +public class Event { +} diff --git a/src/main/java/mops/gruppen2/entities/GruppeRepository.java b/src/main/java/mops/gruppen2/entities/GruppeRepository.java deleted file mode 100644 index 5064219..0000000 --- a/src/main/java/mops/gruppen2/entities/GruppeRepository.java +++ /dev/null @@ -1,6 +0,0 @@ -package mops.gruppen2.entities; - -import org.springframework.data.repository.CrudRepository; - -public interface GruppeRepository extends CrudRepository { -} diff --git a/src/main/java/mops/gruppen2/entities/TeilnehmerRepository.java b/src/main/java/mops/gruppen2/entities/TeilnehmerRepository.java deleted file mode 100644 index 9f08a23..0000000 --- a/src/main/java/mops/gruppen2/entities/TeilnehmerRepository.java +++ /dev/null @@ -1,6 +0,0 @@ -package mops.gruppen2.entities; - -import org.springframework.data.repository.CrudRepository; - -public interface TeilnehmerRepository extends CrudRepository { -} diff --git a/src/main/java/mops/gruppen2/repositories/EventRepository.java b/src/main/java/mops/gruppen2/repositories/EventRepository.java new file mode 100644 index 0000000..70ad99c --- /dev/null +++ b/src/main/java/mops/gruppen2/repositories/EventRepository.java @@ -0,0 +1,7 @@ +package mops.gruppen2.repositories; + +import mops.gruppen2.DTO.Event; +import org.springframework.data.repository.CrudRepository; + +public interface EventRepository extends CrudRepository { +} diff --git a/src/main/java/mops/gruppen2/services/GruppenService.java b/src/main/java/mops/gruppen2/services/GruppenService.java new file mode 100644 index 0000000..c6d262c --- /dev/null +++ b/src/main/java/mops/gruppen2/services/GruppenService.java @@ -0,0 +1,10 @@ +package mops.gruppen2.services; + +import mops.gruppen2.repositories.EventRepository; + +public class GruppenService { + + public GruppenService(EventRepository eventRepository){ + + } +} From cac32dc6726c02c5eb6939d27c7b38ed2cc76a70 Mon Sep 17 00:00:00 2001 From: Christoph Date: Fri, 6 Mar 2020 13:32:59 +0100 Subject: [PATCH 3/7] move createAccountFromPrincipal to service --- .../controllers/Gruppen2Controller.java | 28 ++++++------------- .../gruppen2/services/KeyCloakService.java | 27 ++++++++++++++++++ 2 files changed, 36 insertions(+), 19 deletions(-) create mode 100644 src/main/java/mops/gruppen2/services/KeyCloakService.java diff --git a/src/main/java/mops/gruppen2/controllers/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controllers/Gruppen2Controller.java index 2f9fab5..6347a44 100644 --- a/src/main/java/mops/gruppen2/controllers/Gruppen2Controller.java +++ b/src/main/java/mops/gruppen2/controllers/Gruppen2Controller.java @@ -1,32 +1,22 @@ package mops.gruppen2.controllers; -import javax.annotation.security.RolesAllowed; -import mops.gruppen2.security.Account; -import org.keycloak.KeycloakPrincipal; +import mops.gruppen2.services.KeyCloakService; import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.context.annotation.SessionScope; +import javax.annotation.security.RolesAllowed; + @SessionScope @Controller public class Gruppen2Controller { - /** - * Creates an Account. - * - * @param token Ein toller token - * @return Account with current userdata - */ - private Account createAccountFromPrincipal(KeycloakAuthenticationToken token) { - KeycloakPrincipal principal = (KeycloakPrincipal) token.getPrincipal(); - return new Account( - principal.getName(), - principal.getKeycloakSecurityContext().getIdToken().getEmail(), - null, - principal.getKeycloakSecurityContext().getIdToken().getGivenName(), - principal.getKeycloakSecurityContext().getIdToken().getFamilyName(), - token.getAccount().getRoles()); + + private final KeyCloakService keyCloakService; + + public Gruppen2Controller(KeyCloakService keyCloakService) { + this.keyCloakService = keyCloakService; } /**Zeigt die index.html an. @@ -38,7 +28,7 @@ public class Gruppen2Controller { @GetMapping("/") @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"}) public String index(KeycloakAuthenticationToken token, Model model) { - model.addAttribute("account", createAccountFromPrincipal(token)); + model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token)); return "index"; } } diff --git a/src/main/java/mops/gruppen2/services/KeyCloakService.java b/src/main/java/mops/gruppen2/services/KeyCloakService.java new file mode 100644 index 0000000..99d2548 --- /dev/null +++ b/src/main/java/mops/gruppen2/services/KeyCloakService.java @@ -0,0 +1,27 @@ +package mops.gruppen2.services; + +import mops.gruppen2.security.Account; +import org.keycloak.KeycloakPrincipal; +import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken; +import org.springframework.stereotype.Service; + +@Service +public class KeyCloakService { + + /** + * Creates an Account. + * + * @param token Ein toller token + * @return Account with current userdata + */ + public Account createAccountFromPrincipal(KeycloakAuthenticationToken token) { + KeycloakPrincipal principal = (KeycloakPrincipal) token.getPrincipal(); + return new Account( + principal.getName(), + principal.getKeycloakSecurityContext().getIdToken().getEmail(), + null, + principal.getKeycloakSecurityContext().getIdToken().getGivenName(), + principal.getKeycloakSecurityContext().getIdToken().getFamilyName(), + token.getAccount().getRoles()); + } +} From 761727c8f0d09cbb7aeeaefdbf33f66576214983 Mon Sep 17 00:00:00 2001 From: Christoph Date: Fri, 6 Mar 2020 13:35:37 +0100 Subject: [PATCH 4/7] add gruppen2/ prefix to url --- .../java/mops/gruppen2/controllers/Gruppen2Controller.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/mops/gruppen2/controllers/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controllers/Gruppen2Controller.java index 6347a44..8af3231 100644 --- a/src/main/java/mops/gruppen2/controllers/Gruppen2Controller.java +++ b/src/main/java/mops/gruppen2/controllers/Gruppen2Controller.java @@ -5,12 +5,14 @@ import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.context.annotation.SessionScope; import javax.annotation.security.RolesAllowed; @SessionScope @Controller +@RequestMapping("/gruppen2") public class Gruppen2Controller { private final KeyCloakService keyCloakService; @@ -25,8 +27,8 @@ public class Gruppen2Controller { * @param model tolles model * @return index.html */ - @GetMapping("/") @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"}) + @GetMapping("") public String index(KeycloakAuthenticationToken token, Model model) { model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token)); return "index"; From 75143b33c0e21c11a2fc83f4aae5a936097459b3 Mon Sep 17 00:00:00 2001 From: killerber4t Date: Fri, 6 Mar 2020 14:20:04 +0100 Subject: [PATCH 5/7] add Event related stuff and Group example --- src/main/java/mops/gruppen2/DTO/Event.java | 4 ---- .../gruppen2/Events/CreateGroupEvent.java | 17 ++++++++++++++ src/main/java/mops/gruppen2/Events/Event.java | 15 ++++++++++++ .../controllers/Gruppen2Controller.java | 4 ++++ .../java/mops/gruppen2/entities/Admin.java | 2 +- .../java/mops/gruppen2/entities/Gruppe.java | 14 +++++++++++ .../java/mops/gruppen2/entities/Orga.java | 4 ++++ .../java/mops/gruppen2/entities/Rolle.java | 5 ++++ .../java/mops/gruppen2/entities/Student.java | 10 -------- .../repositories/EventRepository.java | 2 +- .../gruppen2/services/GruppenService.java | 23 +++++++++++++++++-- 11 files changed, 82 insertions(+), 18 deletions(-) delete mode 100644 src/main/java/mops/gruppen2/DTO/Event.java create mode 100644 src/main/java/mops/gruppen2/Events/CreateGroupEvent.java create mode 100644 src/main/java/mops/gruppen2/Events/Event.java create mode 100644 src/main/java/mops/gruppen2/entities/Orga.java create mode 100644 src/main/java/mops/gruppen2/entities/Rolle.java delete mode 100644 src/main/java/mops/gruppen2/entities/Student.java diff --git a/src/main/java/mops/gruppen2/DTO/Event.java b/src/main/java/mops/gruppen2/DTO/Event.java deleted file mode 100644 index 2876163..0000000 --- a/src/main/java/mops/gruppen2/DTO/Event.java +++ /dev/null @@ -1,4 +0,0 @@ -package mops.gruppen2.DTO; - -public class Event { -} diff --git a/src/main/java/mops/gruppen2/Events/CreateGroupEvent.java b/src/main/java/mops/gruppen2/Events/CreateGroupEvent.java new file mode 100644 index 0000000..06d432d --- /dev/null +++ b/src/main/java/mops/gruppen2/Events/CreateGroupEvent.java @@ -0,0 +1,17 @@ +package mops.gruppen2.Events; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.Getter; + +@Getter +public class CreateGroupEvent extends Event{ + String titel; + String beschreibung; + + public CreateGroupEvent(Long id, Long gruppe_id, Long user_id, String titel,String beschreibung) { + super(id, gruppe_id, user_id); + this.titel = titel; + this.beschreibung = beschreibung; + } +} diff --git a/src/main/java/mops/gruppen2/Events/Event.java b/src/main/java/mops/gruppen2/Events/Event.java new file mode 100644 index 0000000..203f08f --- /dev/null +++ b/src/main/java/mops/gruppen2/Events/Event.java @@ -0,0 +1,15 @@ +package mops.gruppen2.Events; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.data.annotation.Id; + +@Getter +@AllArgsConstructor +public class Event { + @Id + Long id; + Long gruppe_id; + Long user_id; + +} diff --git a/src/main/java/mops/gruppen2/controllers/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controllers/Gruppen2Controller.java index 2f9fab5..c9f1d81 100644 --- a/src/main/java/mops/gruppen2/controllers/Gruppen2Controller.java +++ b/src/main/java/mops/gruppen2/controllers/Gruppen2Controller.java @@ -2,8 +2,10 @@ package mops.gruppen2.controllers; import javax.annotation.security.RolesAllowed; import mops.gruppen2.security.Account; +import mops.gruppen2.services.GruppenService; import org.keycloak.KeycloakPrincipal; import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; @@ -12,6 +14,8 @@ import org.springframework.web.context.annotation.SessionScope; @SessionScope @Controller public class Gruppen2Controller { + @Autowired + GruppenService gruppenService; /** * Creates an Account. * diff --git a/src/main/java/mops/gruppen2/entities/Admin.java b/src/main/java/mops/gruppen2/entities/Admin.java index c4d6e46..dcc21d8 100644 --- a/src/main/java/mops/gruppen2/entities/Admin.java +++ b/src/main/java/mops/gruppen2/entities/Admin.java @@ -1,4 +1,4 @@ package mops.gruppen2.entities; -public class Admin extends Teilnehmer{ +public class Admin extends Rolle { } diff --git a/src/main/java/mops/gruppen2/entities/Gruppe.java b/src/main/java/mops/gruppen2/entities/Gruppe.java index f02bc9d..33f163d 100644 --- a/src/main/java/mops/gruppen2/entities/Gruppe.java +++ b/src/main/java/mops/gruppen2/entities/Gruppe.java @@ -1,6 +1,8 @@ package mops.gruppen2.entities; import lombok.Data; +import mops.gruppen2.Events.CreateGroupEvent; +import mops.gruppen2.Events.Event; import org.springframework.data.annotation.Id; import java.util.List; @@ -12,4 +14,16 @@ public class Gruppe { String titel; String beschreibung; List teilnehmersList; + + public void applyEvent(Event event){ + + } + + public void applyEvent(CreateGroupEvent event){ + this.id = event.getId(); + this.titel = event.getTitel(); + this.beschreibung = event.getBeschreibung(); + this.teilnehmersList= null; + } + } diff --git a/src/main/java/mops/gruppen2/entities/Orga.java b/src/main/java/mops/gruppen2/entities/Orga.java new file mode 100644 index 0000000..ad86b27 --- /dev/null +++ b/src/main/java/mops/gruppen2/entities/Orga.java @@ -0,0 +1,4 @@ +package mops.gruppen2.entities; + +public class Orga extends Rolle { +} diff --git a/src/main/java/mops/gruppen2/entities/Rolle.java b/src/main/java/mops/gruppen2/entities/Rolle.java new file mode 100644 index 0000000..1a7bb04 --- /dev/null +++ b/src/main/java/mops/gruppen2/entities/Rolle.java @@ -0,0 +1,5 @@ +package mops.gruppen2.entities; + +public class Rolle { + +} diff --git a/src/main/java/mops/gruppen2/entities/Student.java b/src/main/java/mops/gruppen2/entities/Student.java deleted file mode 100644 index d3aeeb4..0000000 --- a/src/main/java/mops/gruppen2/entities/Student.java +++ /dev/null @@ -1,10 +0,0 @@ -package mops.gruppen2.entities; - -import lombok.Data; -import org.springframework.data.annotation.Id; - -import java.util.List; - -public class Student extends Teilnehmer{ - -} diff --git a/src/main/java/mops/gruppen2/repositories/EventRepository.java b/src/main/java/mops/gruppen2/repositories/EventRepository.java index 70ad99c..9a8d872 100644 --- a/src/main/java/mops/gruppen2/repositories/EventRepository.java +++ b/src/main/java/mops/gruppen2/repositories/EventRepository.java @@ -1,6 +1,6 @@ package mops.gruppen2.repositories; -import mops.gruppen2.DTO.Event; +import mops.gruppen2.Events.Event; import org.springframework.data.repository.CrudRepository; public interface EventRepository extends CrudRepository { diff --git a/src/main/java/mops/gruppen2/services/GruppenService.java b/src/main/java/mops/gruppen2/services/GruppenService.java index c6d262c..2c67671 100644 --- a/src/main/java/mops/gruppen2/services/GruppenService.java +++ b/src/main/java/mops/gruppen2/services/GruppenService.java @@ -1,10 +1,29 @@ package mops.gruppen2.services; +import mops.gruppen2.Events.CreateGroupEvent; +import mops.gruppen2.Events.Event; +import mops.gruppen2.entities.Gruppe; import mops.gruppen2.repositories.EventRepository; +import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; + +@Service public class GruppenService { - public GruppenService(EventRepository eventRepository){ - + CreateGroupEvent createGroupEvent = new CreateGroupEvent(1L,1L,1L,"hello", "foo"); + + public GruppenService(){ + List eventList = new ArrayList<>(); + eventList.add(createGroupEvent); + Gruppe newGroup = buildGroup(eventList); + System.out.println(newGroup.toString()); + } + + Gruppe buildGroup(List eventList){ + Gruppe newGroup = new Gruppe(); + eventList.forEach(newGroup::applyEvent); + return newGroup; } } From 1ddfab009169539df3a1fdc077eacc645093fd3f Mon Sep 17 00:00:00 2001 From: Christoph Date: Fri, 6 Mar 2020 14:40:55 +0100 Subject: [PATCH 6/7] rename events package, add aggregat superclass --- .../mops/gruppen2/Events/CreateGroupEvent.java | 17 ----------------- src/main/java/mops/gruppen2/Events/Event.java | 15 --------------- .../java/mops/gruppen2/entities/Aggregat.java | 18 ++++++++++++++++++ .../java/mops/gruppen2/entities/Gruppe.java | 14 +++----------- .../mops/gruppen2/events/CreateGroupEvent.java | 15 +++++++++++++++ src/main/java/mops/gruppen2/events/Event.java | 12 ++++++++++++ .../gruppen2/repositories/EventRepository.java | 2 +- .../mops/gruppen2/services/GruppenService.java | 5 ++--- .../services/SerializationService.java | 10 ++++++++++ 9 files changed, 61 insertions(+), 47 deletions(-) delete mode 100644 src/main/java/mops/gruppen2/Events/CreateGroupEvent.java delete mode 100644 src/main/java/mops/gruppen2/Events/Event.java create mode 100644 src/main/java/mops/gruppen2/entities/Aggregat.java create mode 100644 src/main/java/mops/gruppen2/events/CreateGroupEvent.java create mode 100644 src/main/java/mops/gruppen2/events/Event.java create mode 100644 src/main/java/mops/gruppen2/services/SerializationService.java diff --git a/src/main/java/mops/gruppen2/Events/CreateGroupEvent.java b/src/main/java/mops/gruppen2/Events/CreateGroupEvent.java deleted file mode 100644 index 06d432d..0000000 --- a/src/main/java/mops/gruppen2/Events/CreateGroupEvent.java +++ /dev/null @@ -1,17 +0,0 @@ -package mops.gruppen2.Events; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.Getter; - -@Getter -public class CreateGroupEvent extends Event{ - String titel; - String beschreibung; - - public CreateGroupEvent(Long id, Long gruppe_id, Long user_id, String titel,String beschreibung) { - super(id, gruppe_id, user_id); - this.titel = titel; - this.beschreibung = beschreibung; - } -} diff --git a/src/main/java/mops/gruppen2/Events/Event.java b/src/main/java/mops/gruppen2/Events/Event.java deleted file mode 100644 index 203f08f..0000000 --- a/src/main/java/mops/gruppen2/Events/Event.java +++ /dev/null @@ -1,15 +0,0 @@ -package mops.gruppen2.Events; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import org.springframework.data.annotation.Id; - -@Getter -@AllArgsConstructor -public class Event { - @Id - Long id; - Long gruppe_id; - Long user_id; - -} diff --git a/src/main/java/mops/gruppen2/entities/Aggregat.java b/src/main/java/mops/gruppen2/entities/Aggregat.java new file mode 100644 index 0000000..8322852 --- /dev/null +++ b/src/main/java/mops/gruppen2/entities/Aggregat.java @@ -0,0 +1,18 @@ +package mops.gruppen2.entities; + +import mops.gruppen2.events.Event; + +import java.lang.reflect.Method; + +public abstract class Aggregat { + + public void applyEvent(Event event) { + try { + Method method = this.getClass().getDeclaredMethod("applyEvent", event.getClass()); + method.setAccessible(true); + method.invoke(this, event); + } catch (Exception e) { + e.printStackTrace(); + } + } +} diff --git a/src/main/java/mops/gruppen2/entities/Gruppe.java b/src/main/java/mops/gruppen2/entities/Gruppe.java index 33f163d..19369b2 100644 --- a/src/main/java/mops/gruppen2/entities/Gruppe.java +++ b/src/main/java/mops/gruppen2/entities/Gruppe.java @@ -1,29 +1,21 @@ package mops.gruppen2.entities; import lombok.Data; -import mops.gruppen2.Events.CreateGroupEvent; -import mops.gruppen2.Events.Event; -import org.springframework.data.annotation.Id; +import mops.gruppen2.events.CreateGroupEvent; import java.util.List; @Data -public class Gruppe { - @Id - Long id; +public class Gruppe extends Aggregat { + long id; String titel; String beschreibung; List teilnehmersList; - public void applyEvent(Event event){ - - } - public void applyEvent(CreateGroupEvent event){ this.id = event.getId(); this.titel = event.getTitel(); this.beschreibung = event.getBeschreibung(); this.teilnehmersList= null; } - } diff --git a/src/main/java/mops/gruppen2/events/CreateGroupEvent.java b/src/main/java/mops/gruppen2/events/CreateGroupEvent.java new file mode 100644 index 0000000..8b2758c --- /dev/null +++ b/src/main/java/mops/gruppen2/events/CreateGroupEvent.java @@ -0,0 +1,15 @@ +package mops.gruppen2.events; + +import lombok.Getter; + +@Getter +public class CreateGroupEvent extends Event { + String titel; + String beschreibung; + + public CreateGroupEvent(long id, long gruppe_id, long user_id, String titel, String beschreibung) { + super(id, gruppe_id, user_id); + this.titel = titel; + this.beschreibung = beschreibung; + } +} diff --git a/src/main/java/mops/gruppen2/events/Event.java b/src/main/java/mops/gruppen2/events/Event.java new file mode 100644 index 0000000..3ceb3cd --- /dev/null +++ b/src/main/java/mops/gruppen2/events/Event.java @@ -0,0 +1,12 @@ +package mops.gruppen2.events; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class Event { + long id; + long gruppe_id; + long user_id; +} diff --git a/src/main/java/mops/gruppen2/repositories/EventRepository.java b/src/main/java/mops/gruppen2/repositories/EventRepository.java index 9a8d872..a3b329d 100644 --- a/src/main/java/mops/gruppen2/repositories/EventRepository.java +++ b/src/main/java/mops/gruppen2/repositories/EventRepository.java @@ -1,6 +1,6 @@ package mops.gruppen2.repositories; -import mops.gruppen2.Events.Event; +import mops.gruppen2.events.Event; import org.springframework.data.repository.CrudRepository; public interface EventRepository extends CrudRepository { diff --git a/src/main/java/mops/gruppen2/services/GruppenService.java b/src/main/java/mops/gruppen2/services/GruppenService.java index 2c67671..8807ee3 100644 --- a/src/main/java/mops/gruppen2/services/GruppenService.java +++ b/src/main/java/mops/gruppen2/services/GruppenService.java @@ -1,9 +1,8 @@ package mops.gruppen2.services; -import mops.gruppen2.Events.CreateGroupEvent; -import mops.gruppen2.Events.Event; +import mops.gruppen2.events.CreateGroupEvent; +import mops.gruppen2.events.Event; import mops.gruppen2.entities.Gruppe; -import mops.gruppen2.repositories.EventRepository; import org.springframework.stereotype.Service; import java.util.ArrayList; diff --git a/src/main/java/mops/gruppen2/services/SerializationService.java b/src/main/java/mops/gruppen2/services/SerializationService.java new file mode 100644 index 0000000..b8de09a --- /dev/null +++ b/src/main/java/mops/gruppen2/services/SerializationService.java @@ -0,0 +1,10 @@ +package mops.gruppen2.services; + +import org.springframework.stereotype.Service; + +/** + * Übersetzt und baut + */ +@Service +public class SerializationService { +} From 2143fe814b88fa424b20cd81cdbb0bbc70dc0152 Mon Sep 17 00:00:00 2001 From: LukasEttel Date: Fri, 6 Mar 2020 14:49:05 +0100 Subject: [PATCH 7/7] created GruppTest --- src/test/java/mops/gruppen2/entities/GruppeTest.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/test/java/mops/gruppen2/entities/GruppeTest.java diff --git a/src/test/java/mops/gruppen2/entities/GruppeTest.java b/src/test/java/mops/gruppen2/entities/GruppeTest.java new file mode 100644 index 0000000..7cd2ae9 --- /dev/null +++ b/src/test/java/mops/gruppen2/entities/GruppeTest.java @@ -0,0 +1,12 @@ +package mops.gruppen2.entities; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class GruppeTest { + + @Test + void applyEvent() { + } +} \ No newline at end of file