src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemController.java

@@ -5,7 +5,6 @@ import net.hostsharing.hsadminng.hs.booking.generated.api.v1.api.HsBookingItemsA
 import net.hostsharing.hsadminng.hs.booking.generated.api.v1.model.HsBookingItemInsertResource;
 import net.hostsharing.hsadminng.hs.booking.generated.api.v1.model.HsBookingItemPatchResource;
 import net.hostsharing.hsadminng.hs.booking.generated.api.v1.model.HsBookingItemResource;
-import net.hostsharing.hsadminng.hs.booking.item.validators.HsBookingItemEntityValidatorRegistry;
 import net.hostsharing.hsadminng.mapper.KeyValueMap;
 import net.hostsharing.hsadminng.mapper.Mapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +19,7 @@ import java.util.List;
 import java.util.UUID;
 import java.util.function.BiConsumer;
 
+import static net.hostsharing.hsadminng.hs.booking.item.validators.HsBookingItemEntityValidator.validated;
 import static net.hostsharing.hsadminng.mapper.PostgresDateRange.toPostgresDateRange;
 
 @RestController
@@ -62,8 +62,7 @@ public class HsBookingItemController implements HsBookingItemsApi {
 
         final var entityToSave = mapper.map(body, HsBookingItemEntity.class, RESOURCE_TO_ENTITY_POSTMAPPER);
 
-        final HsBookingItemEntity entityToSave1 = bookingItemRepo.save(entityToSave);
+        final var saved = validated(bookingItemRepo.save(entityToSave));
-        final var saved = HsBookingItemEntityValidatorRegistry.validated(entityToSave1);
 
         final var uri =
                 MvcUriComponentsBuilder.fromController(getClass())
@@ -119,7 +118,7 @@ public class HsBookingItemController implements HsBookingItemsApi {
 
         new HsBookingItemEntityPatcher(current).apply(body);
 
-        final var saved = bookingItemRepo.save(HsBookingItemEntityValidatorRegistry.validated(current));
+        final var saved = bookingItemRepo.save(validated(current));
         final var mapped = mapper.map(saved, HsBookingItemResource.class, ENTITY_TO_RESOURCE_POSTMAPPER);
         return ResponseEntity.ok(mapped);
     }

src/main/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsBookingItemEntityValidator.java

@@ -1,20 +1,64 @@
 package net.hostsharing.hsadminng.hs.booking.item.validators;
 
 import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemEntity;
+import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType;
 import net.hostsharing.hsadminng.hs.validation.HsEntityValidator;
+import net.hostsharing.hsadminng.hs.validation.MultiValidationException;
 import net.hostsharing.hsadminng.hs.validation.ValidatableProperty;
 
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Stream;
 
 import static java.util.Arrays.stream;
 import static java.util.Collections.emptyList;
 import static java.util.Optional.ofNullable;
+import static net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType.CLOUD_SERVER;
+import static net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType.MANAGED_SERVER;
+import static net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType.MANAGED_WEBSPACE;
+import static net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType.PRIVATE_CLOUD;
 
 public class HsBookingItemEntityValidator extends HsEntityValidator<HsBookingItemEntity> {
 
+    private static final Map<Enum<HsBookingItemType>, HsEntityValidator<HsBookingItemEntity>> validators = new HashMap<>();
+    static {
+        register(PRIVATE_CLOUD, new HsPrivateCloudBookingItemValidator());
+        register(CLOUD_SERVER, new HsCloudServerBookingItemValidator());
+        register(MANAGED_SERVER, new HsManagedServerBookingItemValidator());
+        register(MANAGED_WEBSPACE, new HsManagedWebspaceBookingItemValidator());
+    }
+
+    private static void register(final Enum<HsBookingItemType> type, final HsEntityValidator<HsBookingItemEntity> validator) {
+        stream(validator.propertyValidators).forEach( entry -> {
+            entry.verifyConsistency(Map.entry(type, validator));
+        });
+        validators.put(type, validator);
+    }
+
+    public static HsEntityValidator<HsBookingItemEntity> forType(final Enum<HsBookingItemType> type) {
+        if ( validators.containsKey(type)) {
+            return validators.get(type);
+        }
+        throw new IllegalArgumentException("no validator found for type " + type);
+    }
+
+    public static  Set<Enum<HsBookingItemType>> types() {
+        return validators.keySet();
+    }
+
+    public static List<String> doValidate(final HsBookingItemEntity bookingItem) {
+        return HsBookingItemEntityValidator.forType(bookingItem.getType()).validate(bookingItem);
+    }
+
+    public static HsBookingItemEntity validated(final HsBookingItemEntity entityToSave) {
+        MultiValidationException.throwInvalid(doValidate(entityToSave));
+        return entityToSave;
+    }
+
     public HsBookingItemEntityValidator(final ValidatableProperty<?>... properties) {
         super(properties);
     }
@@ -28,7 +72,7 @@ public class HsBookingItemEntityValidator extends HsEntityValidator<HsBookingIte
     }
 
     private static List<String> optionallyValidate(final HsBookingItemEntity bookingItem) {
-        return bookingItem != null ? HsBookingItemEntityValidatorRegistry.doValidate(bookingItem) : emptyList();
+        return bookingItem != null ? HsBookingItemEntityValidator.doValidate(bookingItem) : emptyList();
     }
 
     protected List<String> validateAgainstSubEntities(final HsBookingItemEntity bookingItem) {

src/main/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsBookingItemEntityValidatorRegistry.java

@@ -1,55 +0,0 @@
-package net.hostsharing.hsadminng.hs.booking.item.validators;
-
-import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemEntity;
-import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType;
-import net.hostsharing.hsadminng.hs.validation.HsEntityValidator;
-import net.hostsharing.hsadminng.hs.validation.MultiValidationException;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static java.util.Arrays.stream;
-import static net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType.CLOUD_SERVER;
-import static net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType.MANAGED_SERVER;
-import static net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType.MANAGED_WEBSPACE;
-import static net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType.PRIVATE_CLOUD;
-
-public class HsBookingItemEntityValidatorRegistry {
-
-    private static final Map<Enum<HsBookingItemType>, HsEntityValidator<HsBookingItemEntity>> validators = new HashMap<>();
-    static {
-        register(PRIVATE_CLOUD, new HsPrivateCloudBookingItemValidator());
-        register(CLOUD_SERVER, new HsCloudServerBookingItemValidator());
-        register(MANAGED_SERVER, new HsManagedServerBookingItemValidator());
-        register(MANAGED_WEBSPACE, new HsManagedWebspaceBookingItemValidator());
-    }
-
-    private static void register(final Enum<HsBookingItemType> type, final HsEntityValidator<HsBookingItemEntity> validator) {
-        stream(validator.propertyValidators).forEach( entry -> {
-            entry.verifyConsistency(Map.entry(type, validator));
-        });
-        validators.put(type, validator);
-    }
-
-    public static HsEntityValidator<HsBookingItemEntity> forType(final Enum<HsBookingItemType> type) {
-        if ( validators.containsKey(type)) {
-            return validators.get(type);
-        }
-        throw new IllegalArgumentException("no validator found for type " + type);
-    }
-
-    public static  Set<Enum<HsBookingItemType>> types() {
-        return validators.keySet();
-    }
-
-    public static List<String> doValidate(final HsBookingItemEntity bookingItem) {
-        return HsBookingItemEntityValidatorRegistry.forType(bookingItem.getType()).validate(bookingItem);
-    }
-
-    public static HsBookingItemEntity validated(final HsBookingItemEntity entityToSave) {
-        MultiValidationException.throwInvalid(doValidate(entityToSave));
-        return entityToSave;
-    }
-}

src/main/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsCloudServerBookingItemValidator.java

@@ -1,6 +1,8 @@
 package net.hostsharing.hsadminng.hs.booking.item.validators;
 
+import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemEntity;
 
+import java.util.List;
 
 import static net.hostsharing.hsadminng.hs.validation.EnumerationProperty.enumerationProperty;
 import static net.hostsharing.hsadminng.hs.validation.IntegerProperty.integerProperty;
@@ -17,4 +19,11 @@ class HsCloudServerBookingItemValidator extends HsBookingItemEntityValidator {
             enumerationProperty("SLA-Infrastructure").values("BASIC", "EXT8H", "EXT4H", "EXT2H").optional()
         );
     }
+
+    @Override
+    public List<String> validate(final HsBookingItemEntity cloudServerBookingItem) {
+        final var selfValidation = super.validate(cloudServerBookingItem);
+        // FIXME return !selfValidation.isEmpty() ? selfValidation : validateParentEntities(cloudServerBookingItem);
+        return selfValidation;
+    }
 }

src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetController.java

@@ -1,6 +1,5 @@
 package net.hostsharing.hsadminng.hs.hosting.asset;
 
-import net.hostsharing.hsadminng.hs.hosting.asset.validators.HsHostingAssetEntityValidatorRegistry;
 import net.hostsharing.hsadminng.hs.hosting.generated.api.v1.api.HsHostingAssetsApi;
 
 import net.hostsharing.hsadminng.context.Context;
@@ -21,6 +20,8 @@ import java.util.List;
 import java.util.UUID;
 import java.util.function.BiConsumer;
 
+import static net.hostsharing.hsadminng.hs.hosting.asset.validators.HsHostingAssetEntityValidator.validated;
+
 @RestController
 public class HsHostingAssetController implements HsHostingAssetsApi {
 
@@ -61,8 +62,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 = validated(assetRepo.save(entityToSave));
-        final var saved = HsHostingAssetEntityValidatorRegistry.validated(persistentEntity);
 
         final var uri =
                 MvcUriComponentsBuilder.fromController(getClass())
@@ -117,8 +117,7 @@ public class HsHostingAssetController implements HsHostingAssetsApi {
 
         new HsHostingAssetEntityPatcher(current).apply(body);
 
-        final HsHostingAssetEntity persistentEntity = assetRepo.save(current);
+        final var saved = validated(assetRepo.save(current));
-        final var saved = HsHostingAssetEntityValidatorRegistry.validated(persistentEntity);
         final var mapped = mapper.map(saved, HsHostingAssetResource.class);
         return ResponseEntity.ok(mapped);
     }

src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetPropsController.java

@@ -1,6 +1,6 @@
 package net.hostsharing.hsadminng.hs.hosting.asset;
 
-import net.hostsharing.hsadminng.hs.hosting.asset.validators.HsHostingAssetEntityValidatorRegistry;
+import net.hostsharing.hsadminng.hs.hosting.asset.validators.HsHostingAssetEntityValidator;
 import net.hostsharing.hsadminng.hs.hosting.generated.api.v1.api.HsHostingAssetPropsApi;
 import net.hostsharing.hsadminng.hs.hosting.generated.api.v1.model.HsHostingAssetTypeResource;
 import org.springframework.http.ResponseEntity;
@@ -15,7 +15,7 @@ public class HsHostingAssetPropsController implements HsHostingAssetPropsApi {
 
     @Override
     public ResponseEntity<List<String>> listAssetTypes() {
-        final var resource = HsHostingAssetEntityValidatorRegistry.types().stream()
+        final var resource = HsHostingAssetEntityValidator.types().stream()
                 .map(Enum::name)
                 .toList();
         return ResponseEntity.ok(resource);
@@ -25,8 +25,7 @@ public class HsHostingAssetPropsController implements HsHostingAssetPropsApi {
     public ResponseEntity<List<Object>> listAssetTypeProps(
             final HsHostingAssetTypeResource assetType) {
 
-        final Enum<HsHostingAssetType> type = HsHostingAssetType.of(assetType);
+        final var propValidators = HsHostingAssetEntityValidator.forType(HsHostingAssetType.of(assetType));
-        final var propValidators = HsHostingAssetEntityValidatorRegistry.forType(type);
         final List<Map<String, Object>> resource = propValidators.properties();
         return ResponseEntity.ok(toListOfObjects(resource));
     }

src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsHostingAssetEntityValidator.java

@@ -1,20 +1,61 @@
 package net.hostsharing.hsadminng.hs.hosting.asset.validators;
 
 import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemEntity;
-import net.hostsharing.hsadminng.hs.booking.item.validators.HsBookingItemEntityValidatorRegistry;
+import net.hostsharing.hsadminng.hs.booking.item.validators.HsBookingItemEntityValidator;
 import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetEntity;
+import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType;
 import net.hostsharing.hsadminng.hs.validation.HsEntityValidator;
+import net.hostsharing.hsadminng.hs.validation.MultiValidationException;
 import net.hostsharing.hsadminng.hs.validation.ValidatableProperty;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 
 import static java.util.Arrays.stream;
 import static java.util.Collections.emptyList;
 import static java.util.Optional.ofNullable;
+import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.*;
 
 public class HsHostingAssetEntityValidator extends HsEntityValidator<HsHostingAssetEntity> {
 
+    private static final Map<Enum<HsHostingAssetType>, HsEntityValidator<HsHostingAssetEntity>> validators = new HashMap<>();
+    static {
+        register(CLOUD_SERVER, new HsHostingAssetEntityValidator());
+        register(MANAGED_SERVER, new HsManagedServerHostingAssetValidator());
+        register(MANAGED_WEBSPACE, new HsManagedWebspaceHostingAssetValidator());
+        register(UNIX_USER, new HsHostingAssetEntityValidator());
+    }
+
+    private static void register(final Enum<HsHostingAssetType> type, final HsEntityValidator<HsHostingAssetEntity> validator) {
+        stream(validator.propertyValidators).forEach( entry -> {
+            entry.verifyConsistency(Map.entry(type, validator));
+        });
+        validators.put(type, validator);
+    }
+
+    public static HsEntityValidator<HsHostingAssetEntity> forType(final Enum<HsHostingAssetType> type) {
+        if ( validators.containsKey(type)) {
+            return validators.get(type);
+        }
+        throw new IllegalArgumentException("no validator found for type " + type);
+    }
+
+    public static Set<Enum<HsHostingAssetType>> types() {
+        return validators.keySet();
+    }
+
+    public static List<String> doValidate(final HsHostingAssetEntity hostingAsset) {
+        return HsHostingAssetEntityValidator.forType(hostingAsset.getType()).validate(hostingAsset);
+    }
+
+    public static HsHostingAssetEntity validated(final HsHostingAssetEntity entityToSave) {
+        MultiValidationException.throwInvalid(doValidate(entityToSave));
+        return entityToSave;
+    }
+
     public HsHostingAssetEntityValidator(final ValidatableProperty<?>... properties) {
         super(properties);
     }
@@ -31,13 +72,11 @@ public class HsHostingAssetEntityValidator extends HsEntityValidator<HsHostingAs
     }
 
     private static List<String> optionallyValidate(final HsHostingAssetEntity assetEntity) {
-        return assetEntity != null ?
+        return assetEntity != null ? forType(assetEntity.getType()).validate(assetEntity) : emptyList();
-                HsHostingAssetEntityValidatorRegistry.forType(assetEntity.getType()).validate(assetEntity) :
-                emptyList();
     }
 
     private static List<String> optionallyValidate(final HsBookingItemEntity bookingItem) {
-        return bookingItem != null ? HsBookingItemEntityValidatorRegistry.doValidate(bookingItem) : emptyList();
+        return bookingItem != null ? HsBookingItemEntityValidator.doValidate(bookingItem) : emptyList();
     }
 
     protected List<String> validateSubEntities(final HsHostingAssetEntity assetEntity) {

src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsHostingAssetEntityValidatorRegistry.java

@@ -1,50 +0,0 @@
-package net.hostsharing.hsadminng.hs.hosting.asset.validators;
-
-import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetEntity;
-import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType;
-import net.hostsharing.hsadminng.hs.validation.HsEntityValidator;
-import net.hostsharing.hsadminng.hs.validation.MultiValidationException;
-
-import java.util.*;
-
-import static java.util.Arrays.stream;
-import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.*;
-
-public class HsHostingAssetEntityValidatorRegistry {
-
-    private static final Map<Enum<HsHostingAssetType>, HsEntityValidator<HsHostingAssetEntity>> validators = new HashMap<>();
-    static {
-        register(CLOUD_SERVER, new HsHostingAssetEntityValidator());
-        register(MANAGED_SERVER, new HsManagedServerHostingAssetValidator());
-        register(MANAGED_WEBSPACE, new HsManagedWebspaceHostingAssetValidator());
-        register(UNIX_USER, new HsHostingAssetEntityValidator());
-    }
-
-    private static void register(final Enum<HsHostingAssetType> type, final HsEntityValidator<HsHostingAssetEntity> validator) {
-        stream(validator.propertyValidators).forEach( entry -> {
-            entry.verifyConsistency(Map.entry(type, validator));
-        });
-        validators.put(type, validator);
-    }
-
-    public static HsEntityValidator<HsHostingAssetEntity> forType(final Enum<HsHostingAssetType> type) {
-        if ( validators.containsKey(type)) {
-            return validators.get(type);
-        }
-        throw new IllegalArgumentException("no validator found for type " + type);
-    }
-
-    public static Set<Enum<HsHostingAssetType>> types() {
-        return validators.keySet();
-    }
-
-    public static List<String> doValidate(final HsHostingAssetEntity hostingAsset) {
-        return HsHostingAssetEntityValidatorRegistry.forType(hostingAsset.getType()).validate(hostingAsset);
-    }
-
-    public static HsHostingAssetEntity validated(final HsHostingAssetEntity entityToSave) {
-        MultiValidationException.throwInvalid(doValidate(entityToSave));
-        return entityToSave;
-    }
-
-}

src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionController.java

@@ -3,7 +3,6 @@ package net.hostsharing.hsadminng.hs.office.coopassets;
 import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.api.HsOfficeCoopAssetsApi;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.*;
-import net.hostsharing.hsadminng.hs.validation.MultiValidationException;
 import net.hostsharing.hsadminng.mapper.Mapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -14,12 +13,14 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder;
 
 import jakarta.persistence.EntityNotFoundException;
+import jakarta.validation.ValidationException;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 import java.util.function.BiConsumer;
 
+import static java.lang.String.join;
 import static net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeCoopAssetsTransactionTypeResource.*;
 
 @RestController
@@ -96,7 +97,9 @@ public class HsOfficeCoopAssetsTransactionController implements HsOfficeCoopAsse
         validateDebitTransaction(requestBody, violations);
         validateCreditTransaction(requestBody, violations);
         validateAssetValue(requestBody, violations);
-        MultiValidationException.throwInvalid(violations);
+        if (violations.size() > 0) {
+            throw new ValidationException("[" + join(",\n", violations) + "]"); // FIXME: move the join into an exception subclass
+        }
     }
 
     private static void validateDebitTransaction(

src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionController.java

@@ -5,7 +5,6 @@ import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.api.HsOfficeCoopSharesApi;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeCoopSharesTransactionInsertResource;
 import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeCoopSharesTransactionResource;
-import net.hostsharing.hsadminng.hs.validation.MultiValidationException;
 import net.hostsharing.hsadminng.mapper.Mapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -15,12 +14,14 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder;
 
+import jakarta.validation.ValidationException;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 import java.util.function.BiConsumer;
 
+import static java.lang.String.join;
 import static net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeCoopSharesTransactionTypeResource.CANCELLATION;
 import static net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeCoopSharesTransactionTypeResource.SUBSCRIPTION;
 
@@ -98,7 +99,9 @@ public class HsOfficeCoopSharesTransactionController implements HsOfficeCoopShar
         validateSubscriptionTransaction(requestBody, violations);
         validateCancellationTransaction(requestBody, violations);
         validateshareCount(requestBody, violations);
-        MultiValidationException.throwInvalid(violations);
+        if (violations.size() > 0) {
+            throw new ValidationException("[" + join(",\n", violations) + "]"); // FIXME: move the join into an exception subclass
+        }
     }
 
     private static void validateSubscriptionTransaction(

src/main/java/net/hostsharing/hsadminng/hs/validation/HsEntityValidator.java

@@ -1,7 +1,7 @@
 package net.hostsharing.hsadminng.hs.validation;
 
 import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemEntity;
-import net.hostsharing.hsadminng.hs.booking.item.validators.HsBookingItemEntityValidatorRegistry;
+import net.hostsharing.hsadminng.hs.booking.item.validators.HsBookingItemEntityValidator;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -52,9 +52,9 @@ public abstract class HsEntityValidator<E> {
     }
 
     protected List<String> validateParentEntities(final HsBookingItemEntity bookingItem) {
-        return bookingItem.getParentItem() != null ?
+        return bookingItem.getParentItem() != null
-                HsBookingItemEntityValidatorRegistry.doValidate(bookingItem.getParentItem()) :
+                ? HsBookingItemEntityValidator.doValidate(bookingItem.getParentItem())
-                emptyList();
+                : emptyList();
     }
 
     @SafeVarargs

src/test/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsBookingItemEntityValidatorUnitTest.java

@@ -11,6 +11,7 @@ import static net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType.PRIVAT
 import static net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType.CLOUD_SERVER;
 import static net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType.MANAGED_SERVER;
 import static net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType.MANAGED_WEBSPACE;
+import static net.hostsharing.hsadminng.hs.booking.item.validators.HsBookingItemEntityValidator.validated;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
 
@@ -33,7 +34,7 @@ class HsBookingItemEntityValidatorUnitTest {
                 .build();
 
         // when
-        final var result = catchThrowable( ()-> HsBookingItemEntityValidatorRegistry.validated(cloudServerBookingItemEntity));
+        final var result = catchThrowable( ()-> validated(cloudServerBookingItemEntity) );
 
         // then
         assertThat(result).isInstanceOf(ValidationException.class)
@@ -47,7 +48,7 @@ class HsBookingItemEntityValidatorUnitTest {
     @Test
     void listsTypes() {
         // when
-        final var result = HsBookingItemEntityValidatorRegistry.types();
+        final var result = HsBookingItemEntityValidator.types();
 
         // then
         assertThat(result).containsExactlyInAnyOrder(PRIVATE_CLOUD, CLOUD_SERVER, MANAGED_SERVER, MANAGED_WEBSPACE);

src/test/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsCloudServerBookingItemValidatorUnitTest.java

@@ -13,6 +13,7 @@ import static java.util.Map.ofEntries;
 import static net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType.CLOUD_SERVER;
 import static net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType.MANAGED_SERVER;
 import static net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType.PRIVATE_CLOUD;
+import static net.hostsharing.hsadminng.hs.booking.item.validators.HsBookingItemEntityValidator.forType;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class HsCloudServerBookingItemValidatorUnitTest {
@@ -42,7 +43,7 @@ class HsCloudServerBookingItemValidatorUnitTest {
                 .build();
 
         // when
-        final var result = HsBookingItemEntityValidatorRegistry.doValidate(cloudServerBookingItemEntity);
+        final var result = HsBookingItemEntityValidator.doValidate(cloudServerBookingItemEntity);
 
         // then
         assertThat(result).containsExactly("D-12345:Test-Project:Test-Server.resources.SLA-EMail is not expected but is set to 'true'");
@@ -51,7 +52,7 @@ class HsCloudServerBookingItemValidatorUnitTest {
     @Test
     void containsAllValidations() {
         // when
-        final var validator = HsBookingItemEntityValidatorRegistry.forType(CLOUD_SERVER);
+        final var validator = forType(CLOUD_SERVER);
 
         // then
         assertThat(validator.properties()).map(Map::toString).containsExactlyInAnyOrder(
@@ -105,7 +106,7 @@ class HsCloudServerBookingItemValidatorUnitTest {
         subCloudServerBookingItemEntity.setParentItem(privateCloudBookingItemEntity);
 
         // when
-        final var result = HsBookingItemEntityValidatorRegistry.doValidate(subCloudServerBookingItemEntity);
+        final var result = HsBookingItemEntityValidator.doValidate(subCloudServerBookingItemEntity);
 
         // then
         assertThat(result).containsExactlyInAnyOrder(

src/test/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsManagedServerBookingItemValidatorUnitTest.java

@@ -21,6 +21,7 @@ import static net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType.CLOUD_
 import static net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType.MANAGED_SERVER;
 import static net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType.MANAGED_WEBSPACE;
 import static net.hostsharing.hsadminng.hs.booking.item.HsBookingItemType.PRIVATE_CLOUD;
+import static net.hostsharing.hsadminng.hs.booking.item.validators.HsBookingItemEntityValidator.forType;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class HsManagedServerBookingItemValidatorUnitTest {
@@ -50,7 +51,7 @@ class HsManagedServerBookingItemValidatorUnitTest {
                 .build();
 
         // when
-        final var result = HsBookingItemEntityValidatorRegistry.doValidate(mangedServerBookingItemEntity);
+        final var result = HsBookingItemEntityValidator.doValidate(mangedServerBookingItemEntity);
 
         // then
         assertThat(result).containsExactly("D-12345:Test-Project:null.resources.SLA-EMail is expected to be false because SLA-Platform=BASIC but is true");
@@ -59,7 +60,7 @@ class HsManagedServerBookingItemValidatorUnitTest {
     @Test
     void containsAllValidations() {
         // when
-        final var validator = HsBookingItemEntityValidatorRegistry.forType(MANAGED_SERVER);
+        final var validator = forType(MANAGED_SERVER);
 
         // then
         assertThat(validator.properties()).map(Map::toString).containsExactlyInAnyOrder(
@@ -116,7 +117,7 @@ class HsManagedServerBookingItemValidatorUnitTest {
         subCloudServerBookingItemEntity.setParentItem(privateCloudBookingItemEntity);
 
         // when
-        final var result = HsBookingItemEntityValidatorRegistry.doValidate(subManagedServerBookingItemEntity);
+        final var result = HsBookingItemEntityValidator.doValidate(subManagedServerBookingItemEntity);
 
         // then
         assertThat(result).containsExactlyInAnyOrder(
@@ -162,7 +163,7 @@ class HsManagedServerBookingItemValidatorUnitTest {
                 .build();
 
         // when
-        final var result = HsBookingItemEntityValidatorRegistry.doValidate(managedWebspaceBookingItem);
+        final var result = HsBookingItemEntityValidator.doValidate(managedWebspaceBookingItem);
 
         // then
         assertThat(result).containsExactlyInAnyOrder(

src/test/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsManagedWebspaceBookingItemValidatorUnitTest.java

@@ -37,7 +37,7 @@ class HsManagedWebspaceBookingItemValidatorUnitTest {
                 .build();
 
         // when
-        final var result = HsBookingItemEntityValidatorRegistry.doValidate(mangedServerBookingItemEntity);
+        final var result = HsBookingItemEntityValidator.doValidate(mangedServerBookingItemEntity);
 
         // then
         assertThat(result).containsExactlyInAnyOrder(
@@ -51,7 +51,7 @@ class HsManagedWebspaceBookingItemValidatorUnitTest {
     @Test
     void containsAllValidations() {
         // when
-        final var validator = HsBookingItemEntityValidatorRegistry.forType(MANAGED_WEBSPACE);
+        final var validator = HsBookingItemEntityValidator.forType(MANAGED_WEBSPACE);
 
         // then
         assertThat(validator.properties()).map(Map::toString).containsExactlyInAnyOrder(

src/test/java/net/hostsharing/hsadminng/hs/booking/item/validators/HsPrivateCloudBookingItemValidatorTest.java

@@ -3,6 +3,7 @@ package net.hostsharing.hsadminng.hs.booking.item.validators;
 import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemEntity;
 import org.junit.jupiter.api.Test;
 
+
 import static java.util.List.of;
 import static java.util.Map.entry;
 import static java.util.Map.ofEntries;
@@ -47,7 +48,7 @@ class HsPrivateCloudBookingItemValidatorTest {
                 .build();
 
         // when
-        final var result = HsBookingItemEntityValidatorRegistry.doValidate(privateCloudBookingItemEntity);
+        final var result = HsBookingItemEntityValidator.doValidate(privateCloudBookingItemEntity);
 
         // then
         assertThat(result).isEmpty();
@@ -87,7 +88,7 @@ class HsPrivateCloudBookingItemValidatorTest {
                 .build();
 
         // when
-        final var result = HsBookingItemEntityValidatorRegistry.doValidate(privateCloudBookingItemEntity);
+        final var result = HsBookingItemEntityValidator.doValidate(privateCloudBookingItemEntity);
 
         // then
         assertThat(result).containsExactlyInAnyOrder(

src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsCloudServerHostingAssetValidatorUnitTest.java

@@ -7,6 +7,7 @@ import java.util.Map;
 
 import static java.util.Map.entry;
 import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.CLOUD_SERVER;
+import static net.hostsharing.hsadminng.hs.hosting.asset.validators.HsHostingAssetEntityValidator.forType;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class HsCloudServerHostingAssetValidatorUnitTest {
@@ -21,7 +22,7 @@ class HsCloudServerHostingAssetValidatorUnitTest {
                         entry("RAM", 2000)
                 ))
                 .build();
-        final var validator = HsHostingAssetEntityValidatorRegistry.forType(cloudServerHostingAssetEntity.getType());
+        final var validator = forType(cloudServerHostingAssetEntity.getType());
 
 
         // when
@@ -34,7 +35,7 @@ class HsCloudServerHostingAssetValidatorUnitTest {
     @Test
     void containsAllValidations() {
         // when
-        final var validator = HsHostingAssetEntityValidatorRegistry.forType(CLOUD_SERVER);
+        final var validator = forType(CLOUD_SERVER);
 
         // then
         assertThat(validator.properties()).map(Map::toString).isEmpty();

src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsHostingAssetEntityValidatorUnitTest.java

@@ -6,6 +6,7 @@ import org.junit.jupiter.api.Test;
 import jakarta.validation.ValidationException;
 
 import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.MANAGED_SERVER;
+import static net.hostsharing.hsadminng.hs.hosting.asset.validators.HsHostingAssetEntityValidator.validated;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
 
@@ -20,7 +21,7 @@ class HsHostingAssetEntityValidatorUnitTest {
                 .build();
 
         // when
-        final var result = catchThrowable( ()-> HsHostingAssetEntityValidatorRegistry.validated(managedServerHostingAssetEntity));
+        final var result = catchThrowable( ()-> validated(managedServerHostingAssetEntity) );
 
         // then
         assertThat(result).isInstanceOf(ValidationException.class)

src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsManagedServerHostingAssetValidatorUnitTest.java

@@ -7,6 +7,7 @@ import java.util.Map;
 
 import static java.util.Map.entry;
 import static net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType.MANAGED_SERVER;
+import static net.hostsharing.hsadminng.hs.hosting.asset.validators.HsHostingAssetEntityValidator.forType;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class HsManagedServerHostingAssetValidatorUnitTest {
@@ -23,7 +24,7 @@ class HsManagedServerHostingAssetValidatorUnitTest {
                         entry("monit_max_ram_usage", 101)
                 ))
                 .build();
-        final var validator = HsHostingAssetEntityValidatorRegistry.forType(mangedWebspaceHostingAssetEntity.getType());
+        final var validator = forType(mangedWebspaceHostingAssetEntity.getType());
 
         // when
         final var result = validator.validate(mangedWebspaceHostingAssetEntity);

src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsManagedWebspaceHostingAssetValidatorUnitTest.java

@@ -42,7 +42,7 @@ class HsManagedWebspaceHostingAssetValidatorUnitTest {
     @Test
     void validatesIdentifier() {
         // given
-        final var validator = HsHostingAssetEntityValidatorRegistry.forType(MANAGED_WEBSPACE);
+        final var validator = HsHostingAssetEntityValidator.forType(MANAGED_WEBSPACE);
         final var mangedWebspaceHostingAssetEntity = HsHostingAssetEntity.builder()
                 .type(MANAGED_WEBSPACE)
                 .parentAsset(mangedServerAssetEntity)
@@ -59,7 +59,7 @@ class HsManagedWebspaceHostingAssetValidatorUnitTest {
     @Test
     void validatesUnknownProperties() {
         // given
-        final var validator = HsHostingAssetEntityValidatorRegistry.forType(MANAGED_WEBSPACE);
+        final var validator = HsHostingAssetEntityValidator.forType(MANAGED_WEBSPACE);
         final var mangedWebspaceHostingAssetEntity = HsHostingAssetEntity.builder()
                 .type(MANAGED_WEBSPACE)
                 .parentAsset(mangedServerAssetEntity)
@@ -79,7 +79,7 @@ class HsManagedWebspaceHostingAssetValidatorUnitTest {
     @Test
     void validatesValidEntity() {
         // given
-        final var validator = HsHostingAssetEntityValidatorRegistry.forType(MANAGED_WEBSPACE);
+        final var validator = HsHostingAssetEntityValidator.forType(MANAGED_WEBSPACE);
         final var mangedWebspaceHostingAssetEntity = HsHostingAssetEntity.builder()
                 .type(MANAGED_WEBSPACE)
                 .parentAsset(mangedServerAssetEntity)