PolicyDefinition make parseDefinition non-static and adjust accesses

Signed-off-by: kingthorin <kingthorin@users.noreply.github.com>
zaproxy · Nov 8, 2024 · 9f85171 · 9f85171
1 parent 94ffcbd
commit 9f85171
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 19 deletions.
diff --git a/addOns/automation/src/main/java/org/zaproxy/addon/automation/jobs/ActiveScanJob.java b/addOns/automation/src/main/java/org/zaproxy/addon/automation/jobs/ActiveScanJob.java
@@ -99,8 +99,8 @@ public void verifyParameters(AutomationProgress progress) {
                     break;
                 case "policyDefinition":
                     // Parse the policy defn
-                    PolicyDefinition.parsePolicyDefinition(
-                            jobData.get(key), policyDefinition, this.getName(), progress);
+                    policyDefinition.parsePolicyDefinition(
+                            jobData.get(key), this.getName(), progress);
                     break;
                 case "name":
                 case "tests":

diff --git a/addOns/automation/src/main/java/org/zaproxy/addon/automation/jobs/ActiveScanPolicyJob.java b/addOns/automation/src/main/java/org/zaproxy/addon/automation/jobs/ActiveScanPolicyJob.java
@@ -86,8 +86,8 @@ public void verifyParameters(AutomationProgress progress) {
                     break;
                 case "policyDefinition":
                     // Parse the policy defn
-                    PolicyDefinition.parsePolicyDefinition(
-                            jobData.get(key), policyDefinition, this.getName(), progress);
+                    policyDefinition.parsePolicyDefinition(
+                            jobData.get(key), this.getName(), progress);
                     break;
                 case "name":
                 case "tests":

diff --git a/addOns/automation/src/main/java/org/zaproxy/addon/automation/jobs/PolicyDefinition.java b/addOns/automation/src/main/java/org/zaproxy/addon/automation/jobs/PolicyDefinition.java
@@ -43,28 +43,25 @@ public class PolicyDefinition extends AutomationData {
     private String defaultThreshold = JobUtils.thresholdToI18n(AlertThreshold.MEDIUM.name());
     private List<Rule> rules = new ArrayList<>();
 
-    public static void parsePolicyDefinition(
-            Object policyDefnObj,
-            PolicyDefinition policyDefinition,
-            String jobName,
-            AutomationProgress progress) {
+    public void parsePolicyDefinition(
+            Object policyDefnObj, String jobName, AutomationProgress progress) {
 
         if (policyDefnObj instanceof LinkedHashMap<?, ?>) {
             LinkedHashMap<?, ?> policyDefnData = (LinkedHashMap<?, ?>) policyDefnObj;
 
             if (policyDefnData.isEmpty()) {
-                policyDefinition.setDefaultStrength(null);
+                this.defaultStrength = null;
                 return;
             }
 
             JobUtils.applyParamsToObject(
                     policyDefnData,
-                    policyDefinition,
+                    this,
                     jobName,
                     new String[] {PolicyDefinition.RULES_ELEMENT_NAME},
                     progress);
 
-            List<Rule> rules = new ArrayList<>();
+            this.rules = new ArrayList<>();
             ScanPolicy scanPolicy = new ScanPolicy();
             PluginFactory pluginFactory = scanPolicy.getPluginFactory();
 
@@ -94,7 +91,7 @@ public static void parsePolicyDefinition(
                             if (strength != null) {
                                 rule.setStrength(strength.name().toLowerCase());
                             }
-                            rules.add(rule);
+                            this.rules.add(rule);
 
                         } else {
                             progress.warn(
@@ -103,7 +100,6 @@ public static void parsePolicyDefinition(
                         }
                     }
                 }
-                policyDefinition.setRules(rules);
             } else if (o != null) {
                 progress.warn(
                         Constant.messages.getString(

diff --git a/.../automation/src/test/java/org/zaproxy/addon/automation/jobs/PolicyDefinitionUnitTest.java b/.../automation/src/test/java/org/zaproxy/addon/automation/jobs/PolicyDefinitionUnitTest.java
@@ -189,7 +189,7 @@ void shouldParseValidDefinition() {
         Object data = yaml.load(yamlStr);
 
         // When
-        PolicyDefinition.parsePolicyDefinition(data, policyDefinition, "test", progress);
+        policyDefinition.parsePolicyDefinition(data, "test", progress);
 
         // Then
         assertThat(progress.hasErrors(), is(equalTo(false)));
@@ -223,7 +223,7 @@ void shouldWarnIfUnknownRule() {
         Object data = yaml.load(yamlStr);
 
         // When
-        PolicyDefinition.parsePolicyDefinition(data, policyDefinition, "test", progress);
+        policyDefinition.parsePolicyDefinition(data, "test", progress);
 
         // Then
         assertThat(progress.hasErrors(), is(equalTo(false)));
@@ -250,7 +250,7 @@ void shouldWarnIfDefnNotList() {
         Object data = yaml.load(yamlStr);
 
         // When
-        PolicyDefinition.parsePolicyDefinition(data, policyDefinition, "test", progress);
+        policyDefinition.parsePolicyDefinition(data, "test", progress);
 
         // Then
         assertThat(progress.hasErrors(), is(equalTo(false)));
@@ -270,7 +270,7 @@ void shouldWarnIfRulesNotList() {
         Object data = yaml.load(yamlStr);
 
         // When
-        PolicyDefinition.parsePolicyDefinition(data, policyDefinition, "test", progress);
+        policyDefinition.parsePolicyDefinition(data, "test", progress);
 
         // Then
         assertThat(progress.hasErrors(), is(equalTo(false)));

diff --git a/...ce/src/main/java/org/zaproxy/zap/extension/sequence/automation/SequenceActiveScanJob.java b/...ce/src/main/java/org/zaproxy/zap/extension/sequence/automation/SequenceActiveScanJob.java
@@ -119,7 +119,7 @@ public void verifyParameters(AutomationProgress progress) {
                 case "policyDefinition":
                     // Parse the policy defn
                     policyDefinition.parsePolicyDefinition(
-                            jobData.get(key), policyDefinition, this.getName(), progress);
+                            jobData.get(key), this.getName(), progress);
                     break;
                 case "name":
                 case "tests":