[fix][broker] Revert "Skip loading broker interceptor when disableBrokerInterceptors is true #20422" (#20710)
diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
index b41a562..1a0ee2c 100644
--- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
+++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
@@ -1356,7 +1356,7 @@
@FieldContext(
category = CATEGORY_SERVER,
- doc = "Enable or disable the broker interceptor"
+ doc = "Enable or disable the broker interceptor, which is only used for testing for now"
)
private boolean disableBrokerInterceptors = true;
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptors.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptors.java
index 4ffd873..cef3f0e 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptors.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptors.java
@@ -59,11 +59,6 @@
* @return the collection of broker event interceptor
*/
public static BrokerInterceptor load(ServiceConfiguration conf) throws IOException {
- if (conf.isDisableBrokerInterceptors()) {
- log.info("Skip loading the broker interceptors when disableBrokerInterceptors is true");
- return null;
- }
-
BrokerInterceptorDefinitions definitions =
BrokerInterceptorUtils.searchForInterceptors(conf.getBrokerInterceptorsDirectory(),
conf.getNarExtractionDirectory());
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/BrokerInterceptorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/BrokerInterceptorTest.java
index c612104..d1cf916 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/BrokerInterceptorTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/BrokerInterceptorTest.java
@@ -20,12 +20,9 @@
import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-
import java.io.IOException;
import java.util.HashMap;
import java.util.HashSet;
@@ -39,7 +36,6 @@
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
-import org.apache.pulsar.broker.ServiceConfiguration;
import org.apache.pulsar.broker.testcontext.PulsarTestContext;
import org.apache.pulsar.client.admin.PulsarAdminException;
import org.apache.pulsar.client.api.Consumer;
@@ -311,25 +307,4 @@
}
}
- @Test
- public void testLoadWhenDisableBrokerInterceptorsIsTrue() throws IOException {
- ServiceConfiguration serviceConfiguration = spy(ServiceConfiguration.class);
- serviceConfiguration.setDisableBrokerInterceptors(true);
- BrokerInterceptor brokerInterceptor = BrokerInterceptors.load(serviceConfiguration);
- assertNull(brokerInterceptor);
-
- verify(serviceConfiguration, times(1)).isDisableBrokerInterceptors();
- verify(serviceConfiguration, times(0)).getBrokerInterceptorsDirectory();
- }
-
- @Test
- public void testLoadWhenDisableBrokerInterceptorsIsFalse() throws IOException {
- ServiceConfiguration serviceConfiguration = spy(ServiceConfiguration.class);
- serviceConfiguration.setDisableBrokerInterceptors(false);
- BrokerInterceptor brokerInterceptor = BrokerInterceptors.load(serviceConfiguration);
- assertNull(brokerInterceptor);
-
- verify(serviceConfiguration, times(1)).isDisableBrokerInterceptors();
- verify(serviceConfiguration, times(1)).getBrokerInterceptorsDirectory();
- }
}
