feat(impl): [#528] policyId allow "urn:uuid:" prefix

eclipse-tractusx · May 13, 2024 · 25ced4c · 25ced4c
1 parent 94b5977
commit 25ced4c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/...tore/src/main/java/org/eclipse/tractusx/irs/policystore/validators/PolicyIdValidator.java b/...tore/src/main/java/org/eclipse/tractusx/irs/policystore/validators/PolicyIdValidator.java
@@ -23,6 +23,7 @@
 
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * Validator for list of business partner numbers (BPN).
@@ -44,7 +45,7 @@ public static boolean isValid(final String policyId) {
 
     private static boolean validateUUID(final String uuidStr) {
         try {
-            UUID.fromString(uuidStr);
+            UUID.fromString(StringUtils.removeStart(uuidStr, "urn:uuid:"));
             return true;
         } catch (IllegalArgumentException e) {
             return false;

diff --git a/.../src/test/java/org/eclipse/tractusx/irs/policystore/validators/PolicyIdValidatorTest.java b/.../src/test/java/org/eclipse/tractusx/irs/policystore/validators/PolicyIdValidatorTest.java
@@ -67,7 +67,15 @@ void withValidPolicyId(final String validPolicyId) {
     }
 
     private static Stream<String> generateUUIDs() {
-        return Stream.generate(() -> faker.internet().uuid()).limit(10);
+        return Stream.concat(uuidStream().limit(5), generateUUIDsWithUrnPrefix().limit(5));
+    }
+
+    private static Stream<String> generateUUIDsWithUrnPrefix() {
+        return uuidStream().map(uuid -> "urn:uuid:" + uuid);
+    }
+
+    private static Stream<String> uuidStream() {
+        return Stream.generate(() -> faker.internet().uuid());
     }
 
     @ParameterizedTest