DataDog
diff --git a/‎dd-java-agent/appsec/src/main/java/com/datadog/appsec/powerwaf/PowerWAFModule.java‎
Lines changed: 2 additions & 36 deletions b/‎dd-java-agent/appsec/src/main/java/com/datadog/appsec/powerwaf/PowerWAFModule.java‎
Lines changed: 2 additions & 36 deletions
diff --git a/‎dd-java-agent/appsec/src/main/java/com/datadog/appsec/powerwaf/PowerWAFResultData.java‎
Lines changed: 1 addition & 1 deletion b/‎dd-java-agent/appsec/src/main/java/com/datadog/appsec/powerwaf/PowerWAFResultData.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎dd-java-agent/appsec/src/main/java/com/datadog/appsec/report/AppSecEvent.java‎
Lines changed: 3 additions & 0 deletions b/‎dd-java-agent/appsec/src/main/java/com/datadog/appsec/report/AppSecEvent.java‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎dd-java-agent/appsec/src/main/java/com/datadog/appsec/report/Parameter.java‎
Lines changed: 0 additions & 158 deletions b/‎dd-java-agent/appsec/src/main/java/com/datadog/appsec/report/Parameter.java‎
Lines changed: 0 additions & 158 deletions
diff --git a/‎dd-java-agent/appsec/src/main/java/com/datadog/appsec/report/Rule.java‎
Lines changed: 0 additions & 135 deletions b/‎dd-java-agent/appsec/src/main/java/com/datadog/appsec/report/Rule.java‎
Lines changed: 0 additions & 135 deletions
@@ -14,9 +14,6 @@
 import com.datadog.appsec.event.data.KnownAddresses;
 import com.datadog.appsec.gateway.AppSecRequestContext;
 import com.datadog.appsec.report.AppSecEvent;
-import com.datadog.appsec.report.Parameter;
-import com.datadog.appsec.report.Rule;
-import com.datadog.appsec.report.RuleMatch;
 import com.datadog.appsec.util.StandardizedLogging;
 import com.squareup.moshi.JsonAdapter;
 import com.squareup.moshi.Moshi;
@@ -45,7 +42,6 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.lang.reflect.UndeclaredThrowableException;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -557,45 +553,15 @@ private AppSecEvent buildEvent(PowerWAFResultData wafResult) {
       return null;
     }
 
-    List<RuleMatch> ruleMatchList = new ArrayList<>();
-    for (PowerWAFResultData.RuleMatch rule_match : wafResult.rule_matches) {
-
-      List<Parameter> parameterList = new ArrayList<>();
-
-      for (PowerWAFResultData.Parameter parameter : rule_match.parameters) {
-        parameterList.add(
-            new Parameter.Builder()
-                .withAddress(parameter.address)
-                .withKeyPath(parameter.key_path)
-                .withValue(parameter.value)
-                .withHighlight(parameter.highlight)
-                .build());
-      }
-
-      RuleMatch ruleMatch =
-          new RuleMatch.Builder()
-              .withOperator(rule_match.operator)
-              .withOperatorValue(rule_match.operator_value)
-              .withParameters(parameterList)
-              .build();
-
-      ruleMatchList.add(ruleMatch);
-    }
-
     Long spanId = null;
     AgentSpan agentSpan = AgentTracer.get().activeSpan();
     if (agentSpan != null) {
       spanId = agentSpan.getSpanId();
     }
 
     return new AppSecEvent.Builder()
-        .withRule(
-            new Rule.Builder()
-                .withId(wafResult.rule.id)
-                .withName(wafResult.rule.name)
-                .withTags(wafResult.rule.tags)
-                .build())
-        .withRuleMatches(ruleMatchList)
+        .withRule(wafResult.rule)
+        .withRuleMatches(wafResult.rule_matches)
         .withSpanId(spanId)
         .build();
   }
 
@@ -14,7 +14,7 @@ public static class RuleMatch {
   }
 
   public static class Rule {
-    String id;
+    public String id; // expose for log message
     String name;
     Map<String, String> tags;
   }
 
@@ -1,5 +1,8 @@
 package com.datadog.appsec.report;
 
+import static com.datadog.appsec.powerwaf.PowerWAFResultData.Rule;
+import static com.datadog.appsec.powerwaf.PowerWAFResultData.RuleMatch;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
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`		`- String id;`
	`17`	`+ public String id; // expose for log message`
`18`	`18`	`String name;`
`19`	`19`	`Map<String, String> tags;`
`20`	`20`	`}`