diff --git a/haiti-utils/src/main/java/dev/struchkov/haiti/utils/Checker.java b/haiti-utils/src/main/java/dev/struchkov/haiti/utils/Checker.java index 093b2c8..7173a59 100644 --- a/haiti-utils/src/main/java/dev/struchkov/haiti/utils/Checker.java +++ b/haiti-utils/src/main/java/dev/struchkov/haiti/utils/Checker.java @@ -92,6 +92,14 @@ public final class Checker { return EMPTY.equals(s); } + public static boolean checkNotBlank(String s) { + return checkNotNull(s) && !s.isBlank(); + } + + public static boolean checkBlank(String s) { + return checkNull(s) || s.isBlank(); + } + public static boolean checkFalse(Boolean b) { return b != null && !b; } diff --git a/haiti-utils/src/main/java/dev/struchkov/haiti/utils/Inspector.java b/haiti-utils/src/main/java/dev/struchkov/haiti/utils/Inspector.java index ba8a159..cf09e41 100644 --- a/haiti-utils/src/main/java/dev/struchkov/haiti/utils/Inspector.java +++ b/haiti-utils/src/main/java/dev/struchkov/haiti/utils/Inspector.java @@ -3,7 +3,9 @@ package dev.struchkov.haiti.utils; import java.util.Collection; import java.util.function.Supplier; +import static dev.struchkov.haiti.utils.Checker.checkBlank; import static dev.struchkov.haiti.utils.Checker.checkEmpty; +import static dev.struchkov.haiti.utils.Checker.checkNotBlank; import static dev.struchkov.haiti.utils.Checker.checkNotEmpty; import static dev.struchkov.haiti.utils.Checker.checkNotNull; import static dev.struchkov.haiti.utils.Checker.checkNull; @@ -106,9 +108,11 @@ public final class Inspector { * @throws RuntimeException */ public static void isNotEmpty(Supplier exception, Object... args) { - if (checkEmpty(args)) { - throw exception.get(); - } + if (checkEmpty(args)) throw exception.get(); + } + + public static void isNotEmpty(String s, Supplier exception) { + if (checkEmpty(s)) throw exception.get(); } /** @@ -121,6 +125,10 @@ public final class Inspector { if (checkNotEmpty(collection)) throw exception.get(); } + public static void isEmpty(String s, Supplier exception) { + if (checkNotEmpty(s)) throw exception.get(); + } + /** * Проверка массива на пустоту. Если массив не пустой и не null, то будет выбрашено исключение. * @@ -131,10 +139,19 @@ public final class Inspector { if (checkNotEmpty(args)) throw exception.get(); } + public static void isNotBlank(String s, Supplier exception) { + if (checkBlank(s)) throw exception.get(); + } + + public static void isBlank(String s, Supplier exception) { + if (checkNotBlank(s)) throw exception.get(); + } + /** * Утилитарный класс. */ public static final class Utils { + private Utils() { utilityClass(); }