addressed comments -- removed reflection

apache · Sep 8, 2023 · 4817a64 · 4817a64
1 parent 7d783ca
commit 4817a64
Show file tree

Hide file tree

Showing 15 changed files with 51 additions and 258 deletions.
diff --git a/pinot-broker/pom.xml b/pinot-broker/pom.xml
@@ -152,12 +152,6 @@
       <artifactId>testng</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-query-event-listener</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

diff --git a/pinot-distribution/pinot-assembly.xml b/pinot-distribution/pinot-assembly.xml
@@ -209,13 +209,6 @@
       <destName>plugins/pinot-metrics/pinot-dropwizard/pinot-dropwizard-${project.version}-shaded.jar</destName>
     </file>
     <!-- End Include Pinot Metrics Plugins-->
-    <!-- Start Include Pinot Query Event Listener Plugins-->
-    <file>
-      <source>${pinot.root}/pinot-plugins/pinot-query-event-listener/target/pinot-query-event-listener-${project.version}.jar
-      </source>
-      <destName>plugins/pinot-query-event-listener/pinot-query-event-listener-${project.version}.jar</destName>
-    </file>
-    <!-- End Include Pinot Query Event Listener Plugins-->
     <!-- Start Include Pinot Segment Writer Plugins-->
     <file>
       <source>

diff --git a/pinot-integration-test-base/pom.xml b/pinot-integration-test-base/pom.xml
@@ -168,11 +168,6 @@
       <artifactId>pinot-yammer</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-query-event-listener</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>

diff --git a/pinot-integration-tests/pom.xml b/pinot-integration-tests/pom.xml
@@ -339,11 +339,6 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.pinot</groupId>
-      <artifactId>pinot-query-event-listener</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>testcontainers</artifactId>

diff --git a/pinot-plugins/pinot-query-event-listener/pom.xml b/pinot-plugins/pinot-query-event-listener/pom.xml
diff --git a/.../apache/pinot/plugin/query/event/listener/broker/NoOpBrokerQueryEventListenerFactory.java b/.../apache/pinot/plugin/query/event/listener/broker/NoOpBrokerQueryEventListenerFactory.java
diff --git a/pinot-plugins/pom.xml b/pinot-plugins/pom.xml
@@ -50,7 +50,6 @@
     <module>pinot-segment-writer</module>
     <module>pinot-segment-uploader</module>
     <module>pinot-environment</module>
-    <module>pinot-query-event-listener</module>
   </modules>
 
   <dependencies>

diff --git a/.../java/org/apache/pinot/spi/annotations/queryeventlistener/BrokerEventListenerFactory.java b/.../java/org/apache/pinot/spi/annotations/queryeventlistener/BrokerEventListenerFactory.java
diff --git a/.../org/apache/pinot/spi/annotations/queryeventlistener/BrokerQueryEventListenerFactory.java b/.../org/apache/pinot/spi/annotations/queryeventlistener/BrokerQueryEventListenerFactory.java
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/queryeventlistener/BrokerQueryEventInfo.java b/pinot-spi/src/main/java/org/apache/pinot/spi/queryeventlistener/BrokerQueryEventInfo.java
@@ -23,6 +23,7 @@
 import java.util.List;
 import org.apache.pinot.spi.trace.RequestContext;
 
+
 public class BrokerQueryEventInfo {
     private String _requestId;
     private String _brokerId;

diff --git a/...t-spi/src/main/java/org/apache/pinot/spi/queryeventlistener/BrokerQueryEventListener.java b/...t-spi/src/main/java/org/apache/pinot/spi/queryeventlistener/BrokerQueryEventListener.java
@@ -18,6 +18,7 @@
  */
 package org.apache.pinot.spi.queryeventlistener;
 
+
 public interface BrokerQueryEventListener {
 
     void onQueryCompletion(BrokerQueryEventInfo brokerQueryEventInfo);

diff --git a/.../broker/NoOpBrokerQueryEventListener.java → ...istener/NoOpBrokerQueryEventListener.java b/.../broker/NoOpBrokerQueryEventListener.java → ...istener/NoOpBrokerQueryEventListener.java
@@ -16,16 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pinot.plugin.query.event.listener.broker;
-
-import org.apache.pinot.spi.queryeventlistener.BrokerQueryEventInfo;
-import org.apache.pinot.spi.queryeventlistener.BrokerQueryEventListener;
+package org.apache.pinot.spi.queryeventlistener;
 
 
 public class NoOpBrokerQueryEventListener implements BrokerQueryEventListener {
 
-  @Override
-  public void onQueryCompletion(BrokerQueryEventInfo brokerQueryEventInfo) {
-    // Not implemented method
-  }
+    @Override
+    public void onQueryCompletion(BrokerQueryEventInfo brokerQueryEventInfo) {
+        // Not implemented method
+    }
 }