-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(openapi): precondition exceptions return 412 (#12552)
- Loading branch information
1 parent
23a86fd
commit 7f88710
Showing
8 changed files
with
384 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
...stry/src/main/java/com/linkedin/metadata/aspect/plugins/validation/ValidationSubType.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| package com.linkedin.metadata.aspect.plugins.validation; | ||
|
|
||
| public enum ValidationSubType { | ||
| // A validation exception is thrown | ||
| VALIDATION, | ||
| // A failed precondition is thrown if the header constraints are not met | ||
| PRECONDITION, | ||
| // Exclude from processing further | ||
| FILTER | ||
| } |
223 changes: 223 additions & 0 deletions
223
...va/com/linkedin/metadata/aspect/plugins/validation/ValidationExceptionCollectionTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,223 @@ | ||
| package com.linkedin.metadata.aspect.plugins.validation; | ||
|
|
||
| import static org.mockito.Mockito.*; | ||
| import static org.testng.Assert.*; | ||
|
|
||
| import com.datahub.test.TestEntityProfile; | ||
| import com.linkedin.common.Status; | ||
| import com.linkedin.common.urn.Urn; | ||
| import com.linkedin.common.urn.UrnUtils; | ||
| import com.linkedin.data.schema.annotation.PathSpecBasedSchemaAnnotationVisitor; | ||
| import com.linkedin.metadata.aspect.batch.BatchItem; | ||
| import com.linkedin.metadata.models.registry.ConfigEntityRegistry; | ||
| import com.linkedin.metadata.models.registry.EntityRegistry; | ||
| import com.linkedin.test.metadata.aspect.batch.TestMCP; | ||
| import java.util.Arrays; | ||
| import java.util.Collection; | ||
| import java.util.List; | ||
| import java.util.Set; | ||
| import org.testng.annotations.BeforeMethod; | ||
| import org.testng.annotations.BeforeTest; | ||
| import org.testng.annotations.Test; | ||
|
|
||
| public class ValidationExceptionCollectionTest { | ||
| private final Urn TEST_URN = UrnUtils.getUrn("urn:li:chart:123"); | ||
|
|
||
| private ValidationExceptionCollection collection; | ||
| private EntityRegistry testEntityRegistry; | ||
|
|
||
| private static final String ERROR_MESSAGE = "Test error message"; | ||
|
|
||
| @BeforeTest | ||
| public void disableAssert() { | ||
| PathSpecBasedSchemaAnnotationVisitor.class | ||
| .getClassLoader() | ||
| .setClassAssertionStatus(PathSpecBasedSchemaAnnotationVisitor.class.getName(), false); | ||
| } | ||
|
|
||
| @BeforeMethod | ||
| public void setUp() { | ||
| collection = ValidationExceptionCollection.newCollection(); | ||
| testEntityRegistry = | ||
| new ConfigEntityRegistry( | ||
| TestEntityProfile.class | ||
| .getClassLoader() | ||
| .getResourceAsStream("test-entity-registry.yml")); | ||
| } | ||
|
|
||
| @Test | ||
| public void testNewCollection() { | ||
| assertNotNull(collection); | ||
| assertTrue(collection.isEmpty()); | ||
| assertFalse(collection.hasFatalExceptions()); | ||
| assertEquals(collection.getSubTypes().size(), 0); | ||
| } | ||
|
|
||
| @Test | ||
| public void testAddException() { | ||
| BatchItem testItem = | ||
| TestMCP.ofOneMCP(TEST_URN, new Status(), testEntityRegistry).stream().findFirst().get(); | ||
| AspectValidationException exception = | ||
| new AspectValidationException(testItem, ERROR_MESSAGE, ValidationSubType.VALIDATION, null); | ||
|
|
||
| collection.addException(exception); | ||
|
|
||
| assertEquals(collection.size(), 1); | ||
| assertTrue(collection.containsKey(exception.getAspectGroup())); | ||
| assertTrue(collection.get(exception.getAspectGroup()).contains(exception)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testAddExceptionWithMessage() { | ||
| BatchItem testItem = | ||
| TestMCP.ofOneMCP(TEST_URN, new Status(), testEntityRegistry).stream().findFirst().get(); | ||
| collection.addException(testItem, ERROR_MESSAGE); | ||
|
|
||
| assertEquals(collection.size(), 1); | ||
| assertTrue(collection.hasFatalExceptions()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testHasFatalExceptionsWithMultipleTypes() { | ||
| BatchItem testItem = | ||
| TestMCP.ofOneMCP(TEST_URN, new Status(), testEntityRegistry).stream().findFirst().get(); | ||
|
|
||
| // Add FILTER exception | ||
| collection.addException( | ||
| new AspectValidationException(testItem, ERROR_MESSAGE, ValidationSubType.FILTER, null)); | ||
| assertFalse(collection.hasFatalExceptions()); | ||
|
|
||
| // Add VALIDATION exception | ||
| collection.addException( | ||
| new AspectValidationException(testItem, ERROR_MESSAGE, ValidationSubType.VALIDATION, null)); | ||
| assertTrue(collection.hasFatalExceptions()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testGetSubTypesWithAllTypes() { | ||
| BatchItem testItem = | ||
| TestMCP.ofOneMCP(TEST_URN, new Status(), testEntityRegistry).stream().findFirst().get(); | ||
|
|
||
| collection.addException( | ||
| new AspectValidationException(testItem, ERROR_MESSAGE, ValidationSubType.FILTER, null)); | ||
| collection.addException( | ||
| new AspectValidationException(testItem, ERROR_MESSAGE, ValidationSubType.VALIDATION, null)); | ||
| collection.addException( | ||
| new AspectValidationException( | ||
| testItem, ERROR_MESSAGE, ValidationSubType.PRECONDITION, null)); | ||
|
|
||
| Set<ValidationSubType> subTypes = collection.getSubTypes(); | ||
| assertEquals(subTypes.size(), 3); | ||
| assertTrue( | ||
| subTypes.containsAll( | ||
| Arrays.asList( | ||
| ValidationSubType.FILTER, | ||
| ValidationSubType.VALIDATION, | ||
| ValidationSubType.PRECONDITION))); | ||
| } | ||
|
|
||
| @Test | ||
| public void testSuccessfulAndExceptionItems() { | ||
| BatchItem validationItem = | ||
| TestMCP.ofOneMCP(UrnUtils.getUrn("urn:li:chart:111"), new Status(), testEntityRegistry) | ||
| .stream() | ||
| .findFirst() | ||
| .get(); | ||
| BatchItem filterItem = | ||
| TestMCP.ofOneMCP(UrnUtils.getUrn("urn:li:chart:222"), new Status(), testEntityRegistry) | ||
| .stream() | ||
| .findFirst() | ||
| .get(); | ||
| BatchItem successItem = | ||
| TestMCP.ofOneMCP(UrnUtils.getUrn("urn:li:chart:333"), new Status(), testEntityRegistry) | ||
| .stream() | ||
| .findFirst() | ||
| .get(); | ||
|
|
||
| collection.addException( | ||
| new AspectValidationException( | ||
| validationItem, ERROR_MESSAGE, ValidationSubType.VALIDATION, null)); | ||
| collection.addException( | ||
| new AspectValidationException(filterItem, ERROR_MESSAGE, ValidationSubType.FILTER, null)); | ||
|
|
||
| Collection<BatchItem> items = Arrays.asList(validationItem, filterItem, successItem); | ||
|
|
||
| // Test successful items | ||
| Collection<BatchItem> successful = collection.successful(items); | ||
| assertEquals(successful.size(), 1); | ||
| assertTrue(successful.contains(successItem)); | ||
|
|
||
| // Test exception items | ||
| Collection<BatchItem> exceptions = collection.exceptions(items); | ||
| assertEquals(exceptions.size(), 1); | ||
| assertTrue(exceptions.contains(validationItem)); | ||
| assertFalse(exceptions.contains(filterItem)); // FILTER type should not be included | ||
| } | ||
|
|
||
| @Test | ||
| public void testStreamOperations() { | ||
| BatchItem validationItem = | ||
| TestMCP.ofOneMCP(UrnUtils.getUrn("urn:li:chart:111"), new Status(), testEntityRegistry) | ||
| .stream() | ||
| .findFirst() | ||
| .get(); | ||
| BatchItem successItem = | ||
| TestMCP.ofOneMCP(UrnUtils.getUrn("urn:li:chart:222"), new Status(), testEntityRegistry) | ||
| .stream() | ||
| .findFirst() | ||
| .get(); | ||
|
|
||
| collection.addException( | ||
| new AspectValidationException( | ||
| validationItem, ERROR_MESSAGE, ValidationSubType.VALIDATION, null)); | ||
|
|
||
| List<BatchItem> items = Arrays.asList(validationItem, successItem); | ||
|
|
||
| // Test streamSuccessful | ||
| List<BatchItem> successful = collection.streamSuccessful(items.stream()).toList(); | ||
| assertEquals(successful.size(), 1); | ||
| assertTrue(successful.contains(successItem)); | ||
|
|
||
| // Test streamExceptions | ||
| List<BatchItem> exceptions = collection.streamExceptions(items.stream()).toList(); | ||
| assertEquals(exceptions.size(), 1); | ||
| assertTrue(exceptions.contains(validationItem)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testMultipleExceptionsForSameEntityDifferentAspects() { | ||
| BatchItem item1 = | ||
| TestMCP.ofOneMCP(UrnUtils.getUrn("urn:li:chart:111"), new Status(), testEntityRegistry) | ||
| .stream() | ||
| .findFirst() | ||
| .get(); | ||
| BatchItem item2 = | ||
| TestMCP.ofOneMCP(UrnUtils.getUrn("urn:li:chart:222"), new Status(), testEntityRegistry) | ||
| .stream() | ||
| .findFirst() | ||
| .get(); | ||
|
|
||
| collection.addException( | ||
| new AspectValidationException(item1, ERROR_MESSAGE, ValidationSubType.VALIDATION, null)); | ||
| collection.addException( | ||
| new AspectValidationException(item2, ERROR_MESSAGE, ValidationSubType.VALIDATION, null)); | ||
|
|
||
| assertEquals(collection.size(), 2); | ||
| assertEquals(collection.getSubTypes().size(), 1); | ||
| } | ||
|
|
||
| @Test | ||
| public void testToString() { | ||
| BatchItem testItem = | ||
| TestMCP.ofOneMCP(TEST_URN, new Status(), testEntityRegistry).stream().findFirst().get(); | ||
| AspectValidationException exception = | ||
| new AspectValidationException(testItem, ERROR_MESSAGE, ValidationSubType.VALIDATION, null); | ||
|
|
||
| collection.addException(exception); | ||
|
|
||
| String result = collection.toString(); | ||
| assertTrue(result.contains("ValidationExceptionCollection")); | ||
| assertTrue(result.contains("EntityAspect:")); | ||
| assertTrue(result.contains("urn:li:chart:123")); | ||
| } | ||
| } |
Oops, something went wrong.