From 2d0407df3bbe66ddaae7b73ab56ded7d2c30d81a Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 31 May 2021 15:09:48 +0200
Subject: [PATCH] fix build -> wrong cleanups
---
.../common/command/CommandModelAssembler.java | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandModelAssembler.java b/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandModelAssembler.java
index 616f9cb7ce..78924b0522 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandModelAssembler.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandModelAssembler.java
@@ -49,11 +49,11 @@ class CommandModelAssembler implements RepresentationModelAssembler<Command, Ent
private Link effectedResourceLinkByOrder(Command entity) {
switch (entity.getOrder().getType()) {
case VORGANG:
- return effectedVorgangLink(entity);
+ return linkTo(methodOn(VorgangController.class).getVorgangWithEingang(entity.getRelationId())).withRel(REL_EFFECTED_RESOURCE);
case WIEDERVORLAGE:
- return effectedWiedervorlageLink(entity);
+ return linkTo(methodOn(WiedervorlageController.class).getById(entity.getRelationId())).withRel(REL_EFFECTED_RESOURCE);
case KOMMENTAR:
- return effectedKommentarLink(entity);
+ return linkTo(KommentarController.class).slash(entity.getRelationId()).withRel(REL_EFFECTED_RESOURCE);
case FORWARDING:
return linkTo(methodOn(ForwardingController.class).findByVorgangId(entity.getVorgangId())).withRel(REL_EFFECTED_RESOURCE);
default:
@@ -61,14 +61,6 @@ class CommandModelAssembler implements RepresentationModelAssembler<Command, Ent
}
}
- private Link effectedVorgangLink(Command entity) {
- return linkTo(methodOn(VorgangController.class).getVorgangWithEingang(entity.getRelationId())).withRel(REL_EFFECTED_RESOURCE);
- }
-
- private Link effectedWiedervorlageLink(Command entity) {
- return linkTo(methodOn(WiedervorlageController.class).getById(entity.getRelationId())).withRel(REL_EFFECTED_RESOURCE);
- }
-
private EntityModel<Command> addIf(Predicate<Command> condition, EntityModel<Command> model, Link link) {
return Optional.ofNullable(model.getContent()).filter(condition).map(command -> model.add(link)).orElse(model);
}
--
GitLab