removed root bean path from validation path

Netflix · Dec 31, 2018 · 6243530 · 6243530
1 parent 11aae88
commit 6243530
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/jersey/src/main/java/com/netflix/conductor/server/resources/ValidationExceptionMapper.java b/jersey/src/main/java/com/netflix/conductor/server/resources/ValidationExceptionMapper.java
@@ -101,10 +101,8 @@ private static ErrorResponse constraintViolationExceptionToErrorResponse(Constra
     }
 
     private static String getViolationPath(final ConstraintViolation violation) {
-        final String rootBeanName = violation.getRootBean().getClass().getSimpleName();
         final String propertyPath = violation.getPropertyPath().toString();
-
-        return rootBeanName + (!"".equals(propertyPath) ? '.' + propertyPath : "");
+        return !"".equals(propertyPath) ? propertyPath : "";
     }
 
     private static String getViolationInvalidValue(final Object invalidValue) {

diff --git a/...rness/src/test/java/com/netflix/conductor/tests/integration/AbstractHttpEndToEndTest.java b/...rness/src/test/java/com/netflix/conductor/tests/integration/AbstractHttpEndToEndTest.java
@@ -346,6 +346,12 @@ public void testEmptyCreateWorkflowDef() {
             assertEquals(400, e.getStatus());
             assertEquals("Validation failed, check below errors for detail.", e.getMessage());
             assertFalse(e.isRetryable());
+            List<ValidationError> errors = e.getValidationErrors();
+            List<String> errorMessages = errors.stream()
+                    .map(v -> v.getMessage())
+                    .collect(Collectors.toList());
+            assertTrue(errorMessages.contains("WorkflowDef name cannot be null or empty"));
+            assertTrue(errorMessages.contains("WorkflowTask list cannot be empty"));
             throw e;
         }
     }