From 9f3bc574b0e9fc99b41b381116ff37a9b8844eaf Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Sat, 12 Dec 2020 08:50:58 -0500 Subject: [PATCH] add StringUtil.isOnlyDigits and CommandShellException.getMessage --- src/main/java/org/cobbzilla/util/string/StringUtil.java | 1 + .../java/org/cobbzilla/util/system/CommandShellException.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/main/java/org/cobbzilla/util/string/StringUtil.java b/src/main/java/org/cobbzilla/util/string/StringUtil.java index bd163ab..941d4ba 100644 --- a/src/main/java/org/cobbzilla/util/string/StringUtil.java +++ b/src/main/java/org/cobbzilla/util/string/StringUtil.java @@ -109,6 +109,7 @@ public class StringUtil { public static String safeShellUrlArg (String s) { return s.replaceAll("[^-\\.&?:@+_%/=\\w]+", ""); } public static String onlyDigits (String s) { return s.replaceAll("\\D+", ""); } + public static boolean isOnlyDigits (String s) { return onlyDigits(s).equals(s); } public static String removeWhitespace (String s) { return s.replaceAll("\\p{javaSpaceChar}", ""); } diff --git a/src/main/java/org/cobbzilla/util/system/CommandShellException.java b/src/main/java/org/cobbzilla/util/system/CommandShellException.java index abf2662..e5eec60 100644 --- a/src/main/java/org/cobbzilla/util/system/CommandShellException.java +++ b/src/main/java/org/cobbzilla/util/system/CommandShellException.java @@ -11,6 +11,8 @@ public class CommandShellException extends RuntimeException { @Getter @Setter private CommandResult result; @Getter @Setter private Exception exception; + @Override public String getMessage() { return toString(); } + public CommandShellException (CommandResult result) { this.result = result; } public CommandShellException (Exception e) { this.exception = e; }