comments 1

Signed-off-by: sezen.leblay <[email protected]>

Author: sezen-datadog

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

@@ -155,11 +155,9 @@ private void subscribeConfigurationPoller() {
   }
 
   private void subscribeRulesAndData() {
-    this.configurationPoller.addListener(Product.ASM_DD, new AsmDDTypedListener());
-    this.configurationPoller.addListener(
-        Product.ASM_DATA, new AppSecConfigConfigurationChangesTypedListener());
-    this.configurationPoller.addListener(
-        Product.ASM, new AppSecConfigConfigurationChangesTypedListener());
+    this.configurationPoller.addListener(Product.ASM_DD, new AppSecConfigChangesDDListener());
+    this.configurationPoller.addListener(Product.ASM_DATA, new AppSecConfigChangesListener());
+    this.configurationPoller.addListener(Product.ASM, new AppSecConfigChangesListener());
   }
 
   public void modulesToUpdateVersionIn(List<AppSecModule> modules) {
@@ -170,7 +168,7 @@ public String getCurrentRuleVersion() {
     return currentRuleVersion;
   }
 
-  private class AppSecConfigConfigurationChangesTypedListener implements ProductListener {
+  private class AppSecConfigChangesListener implements ProductListener {
     @Override
     public void accept(ConfigKey configKey, byte[] content, PollingRateHinter pollingRateHinter)
         throws IOException {
@@ -207,7 +205,7 @@ public void commit(PollingRateHinter pollingRateHinter) {
     }
   }
 
-  private class AsmDDTypedListener extends AppSecConfigConfigurationChangesTypedListener {
+  private class AppSecConfigChangesDDListener extends AppSecConfigChangesListener {
     @Override
     public void accept(ConfigKey configKey, byte[] content, PollingRateHinter pollingRateHinter)
         throws IOException {

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

@@ -602,6 +602,22 @@ class AppSecConfigServiceImplSpecification extends DDSpecification {
     AppSecSystem.active = true
   }
 
+  def 'test AppSecConfigChangesListener listener'() {
+    ProductListener listener = new AppSecConfigServiceImpl.AppSecConfigChangesListener()
+    when:
+    listener.remove('my_config' as ConfigKey, null) // unexisting config
+
+    then:
+    thrown RuntimeException
+
+    when:
+    def waf = [waf: null] as Map<String, Object> // wrong input
+    listener.accept('my_config' as ConfigKey, waf, null)
+
+    then:
+    thrown RuntimeException
+  }
+
   private static AppSecFeatures autoUserInstrum(String mode) {
     return new AppSecFeatures().tap { features ->
       features.autoUserInstrum = new AppSecFeatures.AutoUserInstrum().tap { instrum ->

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

@@ -1678,21 +1678,6 @@ class WAFModuleSpecification extends DDSpecification {
     internal == libddwaf
   }
 
-  def 'test AppSecConfigConfigurationChangesTypedListener listener'() {
-    when:
-    listener.remove('my_config' as ConfigKey, null) // unexisting config
-
-    then:
-    thrown RuntimeException
-
-    when:
-    def waf = [waf: null] as Map<String, Object> // wrong input
-    listener.accept('my_config' as ConfigKey, waf, null)
-
-    then:
-    thrown RuntimeException
-  }
-
   /**
    * Helper to return a concrete Waf exception for each WafErrorCode
    */