From f379ae5cb248a14287f0f4b79bff1526fb77a0c2 Mon Sep 17 00:00:00 2001 From: Michael Hoennig Date: Fri, 14 Jun 2024 14:53:46 +0200 Subject: [PATCH] fixing issues from code-review --- .../hs/hosting/asset/HsHostingAssetController.java | 8 ++++---- .../validators/HsBookingItemEntityValidatorUnitTest.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetController.java b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetController.java index 13bb43dd..17475b46 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetController.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetController.java @@ -21,6 +21,8 @@ import java.util.List; import java.util.UUID; import java.util.function.BiConsumer; +import static net.hostsharing.hsadminng.hs.hosting.asset.validators.HsHostingAssetEntityValidatorRegistry.validated; + @RestController public class HsHostingAssetController implements HsHostingAssetsApi { @@ -61,8 +63,7 @@ public class HsHostingAssetController implements HsHostingAssetsApi { final var entityToSave = mapper.map(body, HsHostingAssetEntity.class, RESOURCE_TO_ENTITY_POSTMAPPER); - final HsHostingAssetEntity persistentEntity = assetRepo.save(entityToSave); - final var saved = HsHostingAssetEntityValidatorRegistry.validated(persistentEntity); + final var saved = validated(assetRepo.save(entityToSave)); final var uri = MvcUriComponentsBuilder.fromController(getClass()) @@ -117,8 +118,7 @@ public class HsHostingAssetController implements HsHostingAssetsApi { new HsHostingAssetEntityPatcher(current).apply(body); - final HsHostingAssetEntity persistentEntity = assetRepo.save(current); - final var saved = HsHostingAssetEntityValidatorRegistry.validated(persistentEntity); + final var saved = validated(assetRepo.save(current)); final var mapped = mapper.map(saved, HsHostingAssetResource.class); return ResponseEntity.ok(mapped); } diff --git a/src/test/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsBookingItemEntityValidatorUnitTest.java b/src/test/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsBookingItemEntityValidatorUnitTest.java index 0552e851..e784edec 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsBookingItemEntityValidatorUnitTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsBookingItemEntityValidatorUnitTest.java @@ -38,10 +38,10 @@ class HsBookingItemEntityValidatorUnitTest { // then assertThat(result).isInstanceOf(ValidationException.class) .hasMessageContaining( - "D-12345:test project:Test-Server.resources.CPUs' is required but missing", - "D-12345:test project:Test-Server.resources.RAM' is required but missing", - "D-12345:test project:Test-Server.resources.SSD' is required but missing", - "D-12345:test project:Test-Server.resources.Traffic' is required but missing"); + "'D-12345:test project:Test-Server.resources.CPUs' is required but missing", + "'D-12345:test project:Test-Server.resources.RAM' is required but missing", + "'D-12345:test project:Test-Server.resources.SSD' is required but missing", + "'D-12345:test project:Test-Server.resources.Traffic' is required but missing"); } @Test