From 2031e63b822d55cd1d9f224d3d0ecfe2a02f27d6 Mon Sep 17 00:00:00 2001 From: Martin <git@mail.de> Date: Tue, 25 Mar 2025 10:16:10 +0100 Subject: [PATCH] OZG-725 OZG-7990 add test; cleanup --- ...rganisationsEinheitVorgangWithEingangProcessor.java | 2 +- ...isationsEinheitVorgangWithEingangProcessorTest.java | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/collaboration/OrganisationsEinheitVorgangWithEingangProcessor.java b/alfa-service/src/main/java/de/ozgcloud/alfa/collaboration/OrganisationsEinheitVorgangWithEingangProcessor.java index 301f5947d0..d5a371ede4 100644 --- a/alfa-service/src/main/java/de/ozgcloud/alfa/collaboration/OrganisationsEinheitVorgangWithEingangProcessor.java +++ b/alfa-service/src/main/java/de/ozgcloud/alfa/collaboration/OrganisationsEinheitVorgangWithEingangProcessor.java @@ -29,7 +29,7 @@ class OrganisationsEinheitVorgangWithEingangProcessor implements RepresentationM @Override public EntityModel<VorgangWithEingang> process(EntityModel<VorgangWithEingang> model) { Optional.ofNullable(model.getContent()) - .ifPresent(vorgang -> model.addIf(this.isSearchNeeded(vorgang), + .ifPresent(vorgang -> model.addIf(isSearchNeeded(vorgang), this::buildSearchOrganisationsEinheitLink)); return model; } diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/collaboration/OrganisationsEinheitVorgangWithEingangProcessorTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/collaboration/OrganisationsEinheitVorgangWithEingangProcessorTest.java index 0d86ccad06..b6f7a6c040 100644 --- a/alfa-service/src/test/java/de/ozgcloud/alfa/collaboration/OrganisationsEinheitVorgangWithEingangProcessorTest.java +++ b/alfa-service/src/test/java/de/ozgcloud/alfa/collaboration/OrganisationsEinheitVorgangWithEingangProcessorTest.java @@ -16,7 +16,6 @@ import org.mockito.Mock; import org.mockito.Spy; import org.springframework.hateoas.EntityModel; import org.springframework.hateoas.Link; -import org.springframework.web.util.UriComponentsBuilder; import de.ozgcloud.alfa.common.FeatureToggleProperties; import de.ozgcloud.alfa.common.user.CurrentUserService; @@ -44,6 +43,13 @@ public class OrganisationsEinheitVorgangWithEingangProcessorTest { private final EntityModel<VorgangWithEingang> model = EntityModel.of(vorgang); + @Test + void shouldReturnSameModel() { + var processedModel = processor.process(model); + + assertThat(processedModel).isSameAs(model); + } + @SuppressWarnings("unchecked") @Test void shouldReturnSameModelOnNullContent() { @@ -65,8 +71,6 @@ public class OrganisationsEinheitVorgangWithEingangProcessorTest { var processedModel = processor.process(model); - var expectedHref = UriComponentsBuilder.fromUriString(OrganisationsEinheitController.PATH).build().toString(); - assertThat(processedModel.getLink(OrganisationsEinheitVorgangWithEingangProcessor.REL_SEARCH_ORGANISATIONS_EINHEIT)).get() .extracting(Link::getHref) .isEqualTo(OrganisationsEinheitController.PATH + "?searchBy={searchBy}"); -- GitLab