From c53b2bdd620fe51103f4258a0e5754ab83e75cdf Mon Sep 17 00:00:00 2001 From: Michael Hoennig Date: Mon, 1 Jul 2024 09:08:13 +0200 Subject: [PATCH] some cleanup --- .../hsadminng/hs/validation/HsEntityValidator.java | 1 - .../validators/HsUnixUserHostingAssetValidatorUnitTest.java | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/hostsharing/hsadminng/hs/validation/HsEntityValidator.java b/src/main/java/net/hostsharing/hsadminng/hs/validation/HsEntityValidator.java index 9eb051f1..ba21173e 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/validation/HsEntityValidator.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/validation/HsEntityValidator.java @@ -93,7 +93,6 @@ public abstract class HsEntityValidator { public Map revampProperties(final E entity, final Map config) { final var copy = new HashMap<>(config); stream(propertyValidators).forEach(p -> { - // FIXME: maybe move to ValidatableProperty.postProcess(...)? if ( p.isWriteOnly()) { copy.remove(p.propertyName); } else if (p.isComputed()) { diff --git a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsUnixUserHostingAssetValidatorUnitTest.java b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsUnixUserHostingAssetValidatorUnitTest.java index 4cb597dc..2d677d40 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsUnixUserHostingAssetValidatorUnitTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsUnixUserHostingAssetValidatorUnitTest.java @@ -5,6 +5,7 @@ import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType; import org.junit.jupiter.api.Test; import java.util.Map; +import java.util.stream.Stream; import static net.hostsharing.hsadminng.hs.booking.item.TestHsBookingItem.TEST_MANAGED_SERVER_BOOKING_ITEM; import static net.hostsharing.hsadminng.hs.booking.item.TestHsBookingItem.TEST_MANAGED_WEBSPACE_BOOKING_ITEM; @@ -46,7 +47,10 @@ class HsUnixUserHostingAssetValidatorUnitTest { final var validator = HsHostingAssetEntityValidatorRegistry.forType(unixUserHostingAsset.getType()); // when - final var result = validator.validateEntity(unixUserHostingAsset); // FIXME: validateContext + final var result = Stream.concat( + validator.validateEntity(unixUserHostingAsset).stream(), + validator.validateContext(unixUserHostingAsset).stream() + ).toList(); // then assertThat(result).isEmpty();