addressing review comments

Signed-off-by: mehab <meha.bhargava@citi.com>
sahibamittal · Mar 9, 2023 · 16cf3d6 · 16cf3d6
1 parent 1adb397
commit 16cf3d6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/main/java/org/dependencytrack/policy/PolicyEngine.java b/src/main/java/org/dependencytrack/policy/PolicyEngine.java
@@ -131,7 +131,10 @@ private List<PolicyViolation> createPolicyViolations(final QueryManager qm, fina
         return policyViolations;
     }
 
-    private PolicyViolation.Type determineViolationType(final PolicyCondition.Subject subject) {
+    public PolicyViolation.Type determineViolationType(final PolicyCondition.Subject subject) {
+        if (subject == null) {
+            return null;
+        }
         return switch (subject) {
             case CWE, SEVERITY, VULNERABILITY_ID -> PolicyViolation.Type.SECURITY;
             case AGE, COORDINATES, PACKAGE_URL, CPE, SWID_TAGID, COMPONENT_HASH, VERSION ->

diff --git a/src/test/java/org/dependencytrack/policy/PolicyEngineTest.java b/src/test/java/org/dependencytrack/policy/PolicyEngineTest.java
@@ -32,6 +32,7 @@
 import org.dependencytrack.tasks.scanners.AnalyzerIdentity;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -142,6 +143,13 @@ public void noPolicyAssignedToParentProject() {
         Assert.assertEquals(0, violations.size());
     }
 
+    @Test
+    public void determineViolationTypeTest(){
+        PolicyCondition policyCondition = new PolicyCondition();
+        policyCondition.setSubject(null);
+        PolicyEngine policyEngine = new PolicyEngine();
+        Assertions.assertNull(policyEngine.determineViolationType(policyCondition.getSubject()));
+    }
     @Test
     public void issue1924() {
         Policy policy = qm.createPolicy("Policy 1924", Policy.Operator.ALL, Policy.ViolationState.INFO);
@@ -257,4 +265,4 @@ public void issue2455() {
         Assert.assertEquals("Log4J", policyViolation.getComponent().getName());
         Assert.assertEquals(PolicyCondition.Subject.LICENSE_GROUP, policyViolation.getPolicyCondition().getSubject());
     }
-}
+}