renames

Author: sezen-datadog

dd-java-agent/appsec/src/jmh/java/datadog/appsec/benchmark/WafBenchmark.java

@@ -80,7 +80,7 @@ public void setUp() throws AbstractWafException, IOException {
     AppSecConfig waf = cfg.get("waf");
     wafBuilder = new WafBuilder();
     wafBuilder.addOrUpdateConfig("waf", waf.getRawConfig());
-    wafHandle = wafBuilder.buildWafHandleInstance(wafHandle);
+    wafHandle = wafBuilder.buildWafHandleInstance();
     wafData.put(KnownAddresses.REQUEST_METHOD.getKey(), "POST");
     wafData.put(
         KnownAddresses.REQUEST_URI_RAW.getKey(), "/foo/bar?foo=bar&foo=xpto&foo=%3cscript%3e");
@@ -117,7 +117,7 @@ public void setUp() throws AbstractWafException, IOException {
   @TearDown(Level.Trial)
   public void teardown() {
     if (wafBuilder != null && !wafBuilder.isOnline()) {
-      wafBuilder.destroy();
+      wafBuilder.close();
     }
   }
 }

dd-java-agent/appsec/src/main/java/com/datadog/appsec/AppSecSystem.java

@@ -155,7 +155,7 @@ public static void stop() {
     }
     Blocking.setBlockingService(BlockingService.NOOP);
     APP_SEC_CONFIG_SERVICE.close();
-    wafBuilder.destroy();
+    wafBuilder.close();
   }
 
   private static void loadModules(EventDispatcher eventDispatcher, Monitoring monitoring) {

dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecConfigServiceImpl.java

@@ -29,8 +29,8 @@
 import com.datadog.appsec.ddwaf.WAFStatsReporter;
 import com.datadog.appsec.util.AbortStartupException;
 import com.datadog.appsec.util.StandardizedLogging;
-import com.datadog.ddwaf.RuleSetInfo;
 import com.datadog.ddwaf.WafBuilder;
+import com.datadog.ddwaf.WafDiagnostics;
 import com.datadog.ddwaf.exception.InvalidRuleSetException;
 import datadog.remoteconfig.ConfigurationChangesTypedListener;
 import datadog.remoteconfig.ConfigurationEndListener;
@@ -219,11 +219,11 @@ private ConfigurationChangesTypedListener<AppSecConfig> asmDDTypedListener() {
 
   private void handleWafUpdateResultReport(String configKey, Map<String, Object> rawConfig) {
     try {
-      RuleSetInfo initReport = wafBuilder.addOrUpdateConfig(configKey, rawConfig);
+      WafDiagnostics initReport = wafBuilder.addOrUpdateConfig(configKey, rawConfig);
       initReporter.setReportForPublication(initReport);
       statsReporter.setRulesVersion(initReport.rulesetVersion);
     } catch (InvalidRuleSetException e) {
-      initReporter.setReportForPublication(e.ruleSetInfo);
+      initReporter.setReportForPublication(e.wafDiagnostics);
       throw new RuntimeException(e);
     }
   }

dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFInitializationResultReporter.java

@@ -3,8 +3,8 @@
 import com.datadog.appsec.config.TraceSegmentPostProcessor;
 import com.datadog.appsec.gateway.AppSecRequestContext;
 import com.datadog.appsec.report.AppSecEvent;
-import com.datadog.ddwaf.RuleSetInfo;
 import com.datadog.ddwaf.Waf;
+import com.datadog.ddwaf.WafDiagnostics;
 import com.squareup.moshi.JsonAdapter;
 import com.squareup.moshi.Moshi;
 import com.squareup.moshi.Types;
@@ -27,16 +27,16 @@ public class WAFInitializationResultReporter implements TraceSegmentPostProcesso
           .adapter(
               Types.newParameterizedType(
                   Map.class, String.class, Types.newParameterizedType(List.class, String.class)));
-  private final AtomicReference<RuleSetInfo> pendingReportRef = new AtomicReference<>();
+  private final AtomicReference<WafDiagnostics> pendingReportRef = new AtomicReference<>();
 
-  public void setReportForPublication(RuleSetInfo report) {
+  public void setReportForPublication(WafDiagnostics report) {
     this.pendingReportRef.set(report);
   }
 
   @Override
   public void processTraceSegment(
       TraceSegment segment, AppSecRequestContext ctx, Collection<AppSecEvent> collectedEvents) {
-    RuleSetInfo report = pendingReportRef.get();
+    WafDiagnostics report = pendingReportRef.get();
     if (report == null) {
       return;
     }

dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFModule.java

@@ -251,7 +251,7 @@ private boolean initOrUpdateWafHandle(
       config.dirtyStatus.markAllDirty();
     }
     try {
-      wafHandle = wafBuilder.buildWafHandleInstance(null);
+      wafHandle = wafBuilder.buildWafHandleInstance();
     } catch (AbstractWafException e) {
       log.info("Could not initialize waf handle, no rules were added!", e);
       throw new AppSecModuleActivationException(

dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/config/AppSecConfigServiceImplSpecification.groovy

@@ -57,7 +57,7 @@ class AppSecConfigServiceImplSpecification extends DDSpecification {
   void setUpTest() {
     WafInitialization.ONLINE
     if(wafBuilder != null && !wafBuilder.isOnline()) {
-      wafBuilder.destroy()
+      close()
     }
     wafBuilder = new WafBuilder()
     appSecConfigService = new AppSecConfigServiceImpl(config, poller, reconf, wafBuilder)

dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/ddwaf/WAFModuleSpecification.groovy

@@ -113,7 +113,7 @@ class WAFModuleSpecification extends DDSpecification {
 
   private static void release() {
     if (wafBuilder?.isOnline()) {
-      wafBuilder.destroy()
+      wafBuilder.close()
     }
   }
 

dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/gateway/AppSecRequestContextSpecification.groovy

@@ -209,14 +209,14 @@ class AppSecRequestContextSpecification extends DDSpecification {
     Waf.initialize false
 
     if (wafBuilder?.online){
-      wafBuilder.destroy()
+      close()
     }
     wafBuilder = new WafBuilder()
     def stream = getClass().classLoader.getResourceAsStream("test_multi_config.json")
     def casc = new CurrentAppSecConfig()
     casc.ddConfig = AppSecConfigDeserializer.INSTANCE.deserialize(stream)
     wafBuilder.addOrUpdateConfig("test", casc.ddConfig.rawConfig)
-    new WafContext(wafBuilder.buildWafHandleInstance(null))
+    new WafContext(wafBuilder.buildWafHandleInstance())
   }
 
   void 'close closes the wafContext'() {