From d27ffd0f8d3e39a1eba152c148cd04af3e9efb95 Mon Sep 17 00:00:00 2001 From: Michael Hoennig Date: Mon, 1 Jul 2024 09:48:14 +0200 Subject: [PATCH] only validateContext for related entities, no validateEntity --- .../booking/item/validators/HsBookingItemEntityValidator.java | 2 +- .../asset/validators/HsHostingAssetEntityValidator.java | 4 +--- .../validators/HsHostingAssetEntityValidatorUnitTest.java | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsBookingItemEntityValidator.java b/src/main/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsBookingItemEntityValidator.java index 19ce9629..82a20e54 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsBookingItemEntityValidator.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsBookingItemEntityValidator.java @@ -36,7 +36,7 @@ public class HsBookingItemEntityValidator extends HsEntityValidator optionallyValidate(final HsBookingItemEntity bookingItem) { return bookingItem != null ? enrich(prefix(bookingItem.toShortString(), ""), - HsBookingItemEntityValidatorRegistry.doValidate(bookingItem)) + HsBookingItemEntityValidatorRegistry.forType(bookingItem.getType()).validateContext(bookingItem)) : emptyList(); } diff --git a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsHostingAssetEntityValidator.java b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsHostingAssetEntityValidator.java index 165c0649..8508ae1e 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsHostingAssetEntityValidator.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsHostingAssetEntityValidator.java @@ -88,7 +88,6 @@ public abstract class HsHostingAssetEntityValidator extends HsEntityValidator optionallyValidate(final HsHostingAssetEntity assetEntity) { return assetEntity != null ? enrich(prefix(assetEntity.toShortString(), "parentAsset"), - // FIXME: actually only validateSubEntities is necessary HsHostingAssetEntityValidatorRegistry.forType(assetEntity.getType()).validateContext(assetEntity)) : emptyList(); } @@ -96,8 +95,7 @@ public abstract class HsHostingAssetEntityValidator extends HsEntityValidator optionallyValidate(final HsBookingItemEntity bookingItem) { return bookingItem != null ? enrich(prefix(bookingItem.toShortString(), "bookingItem"), - // FIXME: actually only validateSubEntities is necessary - HsBookingItemEntityValidatorRegistry.doValidate(bookingItem)) + HsBookingItemEntityValidatorRegistry.forType(bookingItem.getType()).validateContext(bookingItem)) : emptyList(); } diff --git a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsHostingAssetEntityValidatorUnitTest.java b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsHostingAssetEntityValidatorUnitTest.java index 82cae1d8..dffea633 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsHostingAssetEntityValidatorUnitTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsHostingAssetEntityValidatorUnitTest.java @@ -42,4 +42,4 @@ class HsHostingAssetEntityValidatorUnitTest { } } -// FIXME: add tests validatesContext + revampProperties +// FIXME: add tests for prepareProperties, validatesContext + revampProperties