feat: enhance FriendlyIds.toUuid to accept both UUID and FriendlyId formats

- toUuid() now auto-detects input format (UUID or FriendlyId)
- Simplify FriendlyId.parse() to delegate to FriendlyIds.toUuid()
- Update documentation

Author: mariuszs

README.md

@@ -133,9 +133,11 @@ This converts a UUID in the form of a string to a FriendlyID, for example: `5wbw
 
  ```java
 FriendlyIds.toUuid("5wbwf6yUxVBcr48AMbz9cb");
+// or
+FriendlyIds.toUuid("c3587ec5-0976-497f-8374-61e0c2ea3da5");
 ```
 
-This converts a FriendlyID to its UUID, for example: `c3587ec5-0976-497f-8374-61e0c2ea3da5`
+This converts a FriendlyID or UUID string to UUID. Both formats are accepted.
 
 
 Notes

friendly-id-openfeign/src/main/java/com/devskiller/friendly_id/openfeign/FriendlyIdDecoder.java

@@ -5,6 +5,7 @@
 import java.util.UUID;
 
 import com.devskiller.friendly_id.FriendlyIds;
+import com.devskiller.friendly_id.type.FriendlyId;
 
 import feign.FeignException;
 import feign.Response;
@@ -24,7 +25,7 @@
  * </p>
  * <ul>
  *   <li>FriendlyId string → {@link UUID}</li>
- *   <li>FriendlyId string → {@link com.devskiller.friendly_id.type.FriendlyId}</li>
+ *   <li>FriendlyId string → {@link FriendlyId}</li>
  * </ul>
  *
  * @see FriendlyIdEncoder
@@ -46,8 +47,8 @@ public Object decode(Response response, Type type) throws IOException, DecodeExc
 			return FriendlyIds.toUuid(stringValue);
 		}
 
-		if (type == com.devskiller.friendly_id.type.FriendlyId.class && decoded instanceof String stringValue) {
-			return parse(stringValue);
+		if (type == FriendlyId.class && decoded instanceof String stringValue) {
+			return FriendlyId.parse(stringValue);
 		}
 
 		return decoded;

friendly-id/src/main/java/com/devskiller/friendly_id/FriendlyIds.java

@@ -50,13 +50,31 @@ public static String toFriendlyId(UUID uuid) {
 	}
 
 	/**
-	 * Decodes a FriendlyId string to UUID.
+	 * Converts a string to UUID, accepting both UUID and FriendlyId formats.
+	 * <p>
+	 * This method auto-detects the format:
+	 * <ul>
+	 *   <li>Standard UUID format (36 chars with hyphens): parsed directly</li>
+	 *   <li>FriendlyId format (up to 22 chars): decoded from Base62</li>
+	 * </ul>
 	 *
-	 * @param friendlyId encoded UUID
-	 * @return decoded UUID
+	 * @param value UUID or FriendlyId string
+	 * @return parsed UUID
+	 * @throws IllegalArgumentException if value is not a valid UUID or FriendlyId
 	 */
-	public static UUID toUuid(String friendlyId) {
-		return Url62.decode(friendlyId);
+	public static UUID toUuid(String value) {
+		if (isStandardUuidFormat(value)) {
+			return UUID.fromString(value);
+		}
+		return Url62.decode(value);
+	}
+
+	private static boolean isStandardUuidFormat(String value) {
+		return value.length() == 36
+				&& value.charAt(8) == '-'
+				&& value.charAt(13) == '-'
+				&& value.charAt(18) == '-'
+				&& value.charAt(23) == '-';
 	}
 
 }

friendly-id/src/main/java/com/devskiller/friendly_id/type/FriendlyId.java

@@ -4,6 +4,8 @@
 import java.util.Objects;
 import java.util.UUID;
 
+import com.devskiller.friendly_id.FriendlyIds;
+
 /**
  * Value object representing a FriendlyId that wraps a UUID.
  * <p>
@@ -108,21 +110,7 @@ public static FriendlyId friendlyId(UUID uuid) {
 	 */
 	public static FriendlyId parse(String value) {
 		Objects.requireNonNull(value, "Value cannot be null");
-		if (isStandardUuidFormat(value)) {
-			return new FriendlyId(UUID.fromString(value));
-		}
-		return new FriendlyId(com.devskiller.friendly_id.FriendlyIds.toUuid(value));
-	}
-
-	/**
-	 * Checks if the string matches standard UUID format (36 chars with hyphens).
-	 */
-	private static boolean isStandardUuidFormat(String value) {
-		return value.length() == 36
-				&& value.charAt(8) == '-'
-				&& value.charAt(13) == '-'
-				&& value.charAt(18) == '-'
-				&& value.charAt(23) == '-';
+		return new FriendlyId(FriendlyIds.toUuid(value));
 	}
 
 	/**
@@ -162,7 +150,7 @@ public UUID uuid() {
 	 * @return the FriendlyId string
 	 */
 	public String value() {
-		return com.devskiller.friendly_id.FriendlyIds.toFriendlyId(uuid);
+		return FriendlyIds.toFriendlyId(uuid);
 	}
 
 	/**