Minor fix

ValentinZakharov · ValentinZakharov · commit 0d0484e3d20a · 2024-06-11T11:32:06.000+02:00
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/powerwaf/PowerWAFResultData.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/powerwaf/PowerWAFResultData.java
@@ -14,7 +14,7 @@ public static class RuleMatch {
   }
 
   public static class Rule {
-    public String id;
+    public String id; // expose for log message
     String name;
     Map<String, String> tags;
   }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/report/AppSecEvent.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/report/AppSecEvent.java
@@ -1,6 +1,7 @@
 package com.datadog.appsec.report;
 
-import static com.datadog.appsec.powerwaf.PowerWAFResultData.*;
+import static com.datadog.appsec.powerwaf.PowerWAFResultData.Rule;
+import static com.datadog.appsec.powerwaf.PowerWAFResultData.RuleMatch;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/util/StandardizedLogging.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/util/StandardizedLogging.java
@@ -1,7 +1,8 @@
 package com.datadog.appsec.util;
 
+import static com.datadog.appsec.powerwaf.PowerWAFResultData.Rule;
+
 import com.datadog.appsec.event.data.Address;
-import com.datadog.appsec.powerwaf.PowerWAFResultData;
 import com.datadog.appsec.report.AppSecEvent;
 import io.sqreen.powerwaf.Powerwaf;
 import org.slf4j.Logger;
@@ -133,7 +134,7 @@ public static void inAppWafReturn(Logger logger, Powerwaf.ResultWithData resultW
   // D6, I5
   public static void attackDetected(Logger logger, AppSecEvent event) {
     String ruleId = "unknown rule";
-    PowerWAFResultData.Rule rule = event.getRule();
+    Rule rule = event.getRule();
     if (rule != null) {
       ruleId = rule.id;
     }
diff --git a/dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/powerwaf/PowerWAFModuleSpecification.groovy b/dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/powerwaf/PowerWAFModuleSpecification.groovy
@@ -15,7 +15,6 @@ import com.datadog.appsec.event.data.KnownAddresses
 import com.datadog.appsec.event.data.MapDataBundle
 import com.datadog.appsec.gateway.AppSecRequestContext
 import com.datadog.appsec.report.AppSecEvent
-import com.datadog.appsec.powerwaf.PowerWAFResultData.Parameter
 import com.datadog.appsec.test.StubAppSecConfigService
 import datadog.trace.api.ConfigDefaults
 import datadog.trace.api.internal.TraceSegment

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public static class RuleMatch {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public static class Rule {`
`17`		`- public String id;`
	`17`	`+ public String id; // expose for log message`
`18`	`18`	`String name;`
`19`	`19`	`Map<String, String> tags;`
`20`	`20`	`}`