wip

HASMAC-AS · Feb 12, 2025 · 014985c · 014985c
1 parent f8e6813
commit 014985c
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 42 deletions.
diff --git a/qendpoint-core/src/main/java/com/the_qa_company/qendpoint/core/util/string/ByteString.java b/qendpoint-core/src/main/java/com/the_qa_company/qendpoint/core/util/string/ByteString.java
@@ -49,42 +49,10 @@ static ByteString copy(CharSequence csq) {
 	 */
 	byte[] getBuffer();
 
-	@Override
-	default int compareTo(ByteString other) {
-		int n = Math.min(length(), other.length());
-		int k = 0;
-		while (k < n) {
-			char c1 = charAt(k);
-			char c2 = other.charAt(k);
-			if (c1 != c2) {
-				return c1 - c2;
-			}
-			k++;
-		}
-		return length() - other.length();
-	}
-
-//	/*
-//	 * (non-Javadoc)
-//	 * @see java.lang.Comparable#compareTo(java.lang.Object)
-//	 */
 //	@Override
 //	default int compareTo(ByteString other) {
 //		int n = Math.min(length(), other.length());
-//
-//		if (n == 0) {
-//			return length() - other.length();
-//		}
-//
-//		byte[] buffer = getBuffer();
-//		byte[] buffer1 = other.getBuffer();
-//
-//		int mismatch = Arrays.mismatch(buffer, buffer1);
-//		if (mismatch == -1) {
-//			return length() - other.length();
-//		}
-//
-//		int k = mismatch;
+//		int k = 0;
 //		while (k < n) {
 //			char c1 = charAt(k);
 //			char c2 = other.charAt(k);
@@ -96,6 +64,38 @@ default int compareTo(ByteString other) {
 //		return length() - other.length();
 //	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Comparable#compareTo(java.lang.Object)
+	 */
+	@Override
+	default int compareTo(ByteString other) {
+		int n = Math.min(length(), other.length());
+
+		if (n == 0) {
+			return length() - other.length();
+		}
+
+		byte[] buffer = getBuffer();
+		byte[] buffer1 = other.getBuffer();
+
+		int mismatch = Arrays.mismatch(buffer, buffer1);
+		if (mismatch == -1) {
+			return length() - other.length();
+		}
+
+		int k = mismatch;
+		while (k < n) {
+			char c1 = charAt(k);
+			char c2 = other.charAt(k);
+			if (c1 != c2) {
+				return c1 - c2;
+			}
+			k++;
+		}
+		return length() - other.length();
+	}
+
 	@Override
 	ByteString subSequence(int start, int end);
 

diff --git a/...oint-core/src/main/java/com/the_qa_company/qendpoint/core/util/string/ByteStringUtil.java b/...oint-core/src/main/java/com/the_qa_company/qendpoint/core/util/string/ByteStringUtil.java
@@ -120,16 +120,16 @@ public static int longestCommonPrefix(CharSequence str1, CharSequence str2) {
 		return longestCommonPrefix(str1, str2, 0);
 	}
 
-	public static int longestCommonPrefix(CharSequence str1, CharSequence str2, int from) {
-		int len = Math.min(str1.length(), str2.length());
-		int delta = from;
-		while (delta < len && str1.charAt(delta) == str2.charAt(delta)) {
-			delta++;
-		}
-		return delta - from;
-	}
+//	public static int longestCommonPrefix(CharSequence str1, CharSequence str2, int from) {
+//		int len = Math.min(str1.length(), str2.length());
+//		int delta = from;
+//		while (delta < len && str1.charAt(delta) == str2.charAt(delta)) {
+//			delta++;
+//		}
+//		return delta - from;
+//	}
 
-	public static int longestCommonPrefixNew(CharSequence str1, CharSequence str2, int from) {
+	public static int longestCommonPrefix(CharSequence str1, CharSequence str2, int from) {
 
 		int len = Math.min(str1.length(), str2.length());
 		if (from >= len) {