From d44790545d7d11db2e41fd986b5f0b3537c91ad2 Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Thu, 1 Aug 2024 15:04:03 -0500 Subject: [PATCH] Add total # failures to message; remove unused c'tor --- .../QInstanceValidationException.java | 30 ++++--------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/exceptions/QInstanceValidationException.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/exceptions/QInstanceValidationException.java index fa090ca1..8b44cf4c 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/exceptions/QInstanceValidationException.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/exceptions/QInstanceValidationException.java @@ -22,8 +22,8 @@ package com.kingsrook.qqq.backend.core.exceptions; -import java.util.Arrays; import java.util.List; +import com.kingsrook.qqq.backend.core.utils.CollectionUtils; import com.kingsrook.qqq.backend.core.utils.StringUtils; @@ -55,12 +55,11 @@ public class QInstanceValidationException extends QException *******************************************************************************/ public QInstanceValidationException(List reasons) { - super( - (reasons != null && reasons.size() > 0) - ? "Instance validation failed for the following reasons:\n - " + StringUtils.join("\n - ", reasons) - : "Validation failed, but no reasons were provided"); + super((CollectionUtils.nullSafeHasContents(reasons)) + ? "Instance validation failed for the following reasons:\n - " + StringUtils.join("\n - ", reasons) + "\n(" + reasons.size() + " Total reason" + StringUtils.plural(reasons) + ")" + : "Validation failed, but no reasons were provided"); - if(reasons != null && reasons.size() > 0) + if(CollectionUtils.nullSafeHasContents(reasons)) { this.reasons = reasons; } @@ -68,25 +67,6 @@ public class QInstanceValidationException extends QException - /******************************************************************************* - ** Constructor of an array/varargs of reasons. They feed into the core exception message. - ** - *******************************************************************************/ - public QInstanceValidationException(String... reasons) - { - super( - (reasons != null && reasons.length > 0) - ? "Instance validation failed for the following reasons: " + StringUtils.joinWithCommasAndAnd(Arrays.stream(reasons).toList()) - : "Validation failed, but no reasons were provided"); - - if(reasons != null && reasons.length > 0) - { - this.reasons = Arrays.stream(reasons).toList(); - } - } - - - /******************************************************************************* ** Constructor of message & cause - does not populate reasons! **