Allow minus sign usage in quest ids (https://github.com/LMBishop/Quests/issues/683)

Add Apache Commons Lang NOTICE.txt to resources

2 files changed, 29 insertions, 18 deletions

diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/lang3/CharSequenceUtils.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/lang3/CharSequenceUtils.java
index 5728e2de..92d81f6d 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/lang3/CharSequenceUtils.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/lang3/CharSequenceUtils.java
@@ -1,13 +1,18 @@
 package com.leonardobishop.quests.bukkit.util.lang3;
 
-/*
- * From Apache Commons Lang
- * https://github.com/apache/commons-lang/blob/master/LICENSE.txt
+/**
+ * Apache Commons Lang<br>
+ * Copyright 2001-2024 The Apache Software Foundation<br>
+ * <br>
+ * This product includes software developed at<br>
+ * The Apache Software Foundation (<a href="https://www.apache.org/">https://www.apache.org/</a>).<br>
+ * <br>
+ * License: <a href="https://github.com/apache/commons-lang/blob/98a67224956a680958568986747160d20cfbbe25/LICENSE.txt">LICENSE.txt</a>
  */
 public final class CharSequenceUtils {
 
-    // https://github.com/apache/commons-lang/blob/master/src/main/java/org/apache/commons/lang3/CharSequenceUtils.java#L294-L338
-    public static boolean regionMatches(final CharSequence cs, final boolean ignoreCase, final int thisStart, // package -> public
+    // https://github.com/apache/commons-lang/blob/98a67224956a680958568986747160d20cfbbe25/src/main/java/org/apache/commons/lang3/CharSequenceUtils.java#L294-L338
+    public static boolean regionMatches(final CharSequence cs, final boolean ignoreCase, final int thisStart, // Quests - package -> public
                                         final CharSequence substring, final int start, final int length)    {
         if (cs instanceof String && substring instanceof String) {
             return ((String) cs).regionMatches(ignoreCase, thisStart, (String) substring, start, length);
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/lang3/StringUtils.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/lang3/StringUtils.java
index 5bf93e56..b42e95ca 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/lang3/StringUtils.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/lang3/StringUtils.java
@@ -1,18 +1,23 @@
 package com.leonardobishop.quests.bukkit.util.lang3;
 
-/*
- * From Apache Commons Lang
- * https://github.com/apache/commons-lang/blob/master/LICENSE.txt
+/**
+ * Apache Commons Lang<br>
+ * Copyright 2001-2024 The Apache Software Foundation<br>
+ * <br>
+ * This product includes software developed at<br>
+ * The Apache Software Foundation (<a href="https://www.apache.org/">https://www.apache.org/</a>).<br>
+ * <br>
+ * License: <a href="https://github.com/apache/commons-lang/blob/98a67224956a680958568986747160d20cfbbe25/LICENSE.txt">LICENSE.txt</a>
  */
 @SuppressWarnings({"BooleanMethodIsAlwaysInverted", "SizeReplaceableByIsEmpty"})
 public final class StringUtils {
 
-    // https://github.com/apache/commons-lang/blob/master/src/main/java/org/apache/commons/lang3/StringUtils.java#L3602-L3604
+    // https://github.com/apache/commons-lang/blob/98a67224956a680958568986747160d20cfbbe25/src/main/java/org/apache/commons/lang3/StringUtils.java#L3655-L3657
     public static boolean isEmpty(final CharSequence cs) {
         return cs == null || cs.length() == 0;
     }
 
-    // https://github.com/apache/commons-lang/blob/master/src/main/java/org/apache/commons/lang3/StringUtils.java#L3361-L3372
+    // https://github.com/apache/commons-lang/blob/98a67224956a680958568986747160d20cfbbe25/src/main/java/org/apache/commons/lang3/StringUtils.java#L3414-L3425
     public static boolean isAlphanumeric(final CharSequence cs) {
         if (isEmpty(cs)) {
             return false;
@@ -20,13 +25,14 @@ public final class StringUtils {
         final int sz = cs.length();
         for (int i = 0; i < sz; i++) {
             if (!Character.isLetterOrDigit(cs.charAt(i))) {
+                if (cs.charAt(i) == '-') continue; // Quests - allow minus sign usage in ids
                 return false;
             }
         }
         return true;
     }
 
-    // https://github.com/apache/commons-lang/blob/master/src/main/java/org/apache/commons/lang3/StringUtils.java#L3774-L3785
+    // https://github.com/apache/commons-lang/blob/98a67224956a680958568986747160d20cfbbe25/src/main/java/org/apache/commons/lang3/StringUtils.java#L3827-L3838
     public static boolean isNumeric(final CharSequence cs) {
         if (isEmpty(cs)) {
             return false;
@@ -40,8 +46,8 @@ public final class StringUtils {
         return true;
     }
 
-    // https://github.com/apache/commons-lang/blob/master/src/main/java/org/apache/commons/lang3/StringUtils.java#L1899-L1910
-    public static boolean equals(final CharSequence cs1, final CharSequence cs2, final boolean ignoreCase) { // make ignore case a parameter
+    // https://github.com/apache/commons-lang/blob/98a67224956a680958568986747160d20cfbbe25/src/main/java/org/apache/commons/lang3/StringUtils.java#L1952-L1963
+    public static boolean equals(final CharSequence cs1, final CharSequence cs2, final boolean ignoreCase) { // Quests - make ignore case a parameter
         if (cs1 == cs2) {
             return true;
         }
@@ -51,11 +57,11 @@ public final class StringUtils {
         if (cs1.length() != cs2.length()) {
             return false;
         }
-        return CharSequenceUtils.regionMatches(cs1, ignoreCase, 0, cs2, 0, cs1.length()); // make ignore case a parameter
+        return CharSequenceUtils.regionMatches(cs1, ignoreCase, 0, cs2, 0, cs1.length()); // Quests - make ignore case a parameter
     }
 
-    // https://github.com/apache/commons-lang/blob/master/src/main/java/org/apache/commons/lang3/StringUtils.java#L7990-L8000
-    public static boolean startsWith(final CharSequence str, final CharSequence prefix, final boolean ignoreCase) { // private -> public
+    // https://github.com/apache/commons-lang/blob/98a67224956a680958568986747160d20cfbbe25/src/main/java/org/apache/commons/lang3/StringUtils.java#L8037-L8047
+    public static boolean startsWith(final CharSequence str, final CharSequence prefix, final boolean ignoreCase) { // Quests - private -> public
         if (str == null || prefix == null) {
             return str == prefix;
         }
@@ -67,8 +73,8 @@ public final class StringUtils {
         return CharSequenceUtils.regionMatches(str, ignoreCase, 0, prefix, 0, preLen);
     }
 
-    // https://github.com/apache/commons-lang/blob/master/src/main/java/org/apache/commons/lang3/StringUtils.java#L1702-L1711
-    public static boolean endsWith(final CharSequence str, final CharSequence suffix, final boolean ignoreCase) { // private -> public
+    // https://github.com/apache/commons-lang/blob/98a67224956a680958568986747160d20cfbbe25/src/main/java/org/apache/commons/lang3/StringUtils.java#L1755-L1764
+    public static boolean endsWith(final CharSequence str, final CharSequence suffix, final boolean ignoreCase) { // Quests - private -> public
         if (str == null || suffix == null) {
             return str == suffix;
         }