From 9d0ea1d66ac7661207f3767c483456e8c16e4f34 Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Thu, 29 Feb 2024 16:37:28 +0100 Subject: [PATCH] OZG-4949 Refactored ExcpetionController and removed old Validated --- .../admin/common/errorhandling/ExceptionController.java | 7 +++---- .../de/ozgcloud/admin/settings/SettingsRepository.java | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/ozgcloud/admin/common/errorhandling/ExceptionController.java b/src/main/java/de/ozgcloud/admin/common/errorhandling/ExceptionController.java index db07ae30..d5e5803b 100644 --- a/src/main/java/de/ozgcloud/admin/common/errorhandling/ExceptionController.java +++ b/src/main/java/de/ozgcloud/admin/common/errorhandling/ExceptionController.java @@ -85,16 +85,15 @@ public class ExceptionController extends ResponseEntityExceptionHandler { private List<Map<String, String>> getDetailedviolationList(Set<ConstraintViolation<?>> violations) { List<Map<String, String>> detailedViolations = new ArrayList<>(); - Optional.ofNullable(violations).orElse(Collections.emptySet()).forEach(v -> addViolation(v, detailedViolations)); + Optional.ofNullable(violations).orElse(Collections.emptySet()).forEach(v -> detailedViolations.add(buildDetailedViolation(v))); return detailedViolations; } - private void addViolation(ConstraintViolation<?> violation, List<Map<String, String>> detailedViolations) { + private Map<String, String> buildDetailedViolation(ConstraintViolation<?> violation) { var detailedViolation = new LinkedHashMap<String, String>(); detailedViolation.put("name", violation.getPropertyPath().toString()); detailedViolation.put("reason", violation.getMessage()); - detailedViolations.add(detailedViolation); + return detailedViolation; } - } diff --git a/src/main/java/de/ozgcloud/admin/settings/SettingsRepository.java b/src/main/java/de/ozgcloud/admin/settings/SettingsRepository.java index e60ee4be..722039cc 100644 --- a/src/main/java/de/ozgcloud/admin/settings/SettingsRepository.java +++ b/src/main/java/de/ozgcloud/admin/settings/SettingsRepository.java @@ -23,10 +23,8 @@ package de.ozgcloud.admin.settings; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.rest.core.annotation.RepositoryRestResource; -import org.springframework.validation.annotation.Validated; @RepositoryRestResource(collectionResourceRel = SettingsConstants.REL, path = SettingsConstants.PATH) -@Validated interface SettingsRepository extends MongoRepository<Settings, String> { } -- GitLab