add Consumers to interface for query started/stopped/progress and ini… (#3)

* add Consumers to interface for query started/stopped/progress and initial logging.

* fix typo in DPLExecutorTestImpl

* remove metrics() from DPLExecutorResult

Author: eemhu

src/main/java/com/teragrep/pth_15/DPLExecutor.java

@@ -48,6 +48,7 @@
 import org.apache.spark.sql.Dataset;
 import org.apache.spark.sql.Row;
 import org.apache.spark.sql.SparkSession;
+import org.apache.spark.sql.streaming.StreamingQuery;
 import org.apache.spark.sql.streaming.StreamingQueryListener;
 
 import java.util.concurrent.TimeoutException;
@@ -58,7 +59,10 @@ public interface DPLExecutor {
 
     public DPLExecutorResult interpret(
             BiConsumer<Dataset<Row>, Boolean> batchHandler,
-            Consumer<StreamingQueryListener.QueryProgressEvent> queryProgressConsumer,
+            BiConsumer<StreamingQuery, StreamingQueryListener.QueryStartedEvent> queryStartedConsumer,
+            BiConsumer<StreamingQuery, StreamingQueryListener.QueryProgressEvent> queryProgressConsumer,
+            BiConsumer<StreamingQuery, StreamingQueryListener.QueryTerminatedEvent> queryTerminatedConsumer,
+            Consumer<String> initialLogConsumer,
             SparkSession sparkSession,
             String noteId,
             String paragraphId,

src/main/java/com/teragrep/pth_15/DPLExecutorResult.java

@@ -45,8 +45,6 @@
  */
 package com.teragrep.pth_15;
 
-import java.util.Map;
-
 public interface DPLExecutorResult {
 
     public enum Code {
@@ -56,6 +54,4 @@ public enum Code {
     public abstract Code code();
 
     public abstract String message();
-
-    public abstract Map<String, String> metrics();
 }

src/test/java/com/teragrep/pth_15/DPLExecutorTestImpl.java

@@ -49,6 +49,7 @@
 import org.apache.spark.sql.Dataset;
 import org.apache.spark.sql.Row;
 import org.apache.spark.sql.SparkSession;
+import org.apache.spark.sql.streaming.StreamingQuery;
 import org.apache.spark.sql.streaming.StreamingQueryListener;
 
 import java.util.concurrent.TimeoutException;
@@ -62,12 +63,15 @@ public DPLExecutorTestImpl(Config ignored) {
 
     @Override
     public DPLExecutorResult interpret(
-            final BiConsumer<Dataset<Row>, Boolean> batchHandler,
-            final Consumer<StreamingQueryListener.QueryProgressEvent> queryProgressConsumer,
-            final SparkSession sparkSession,
-            final String noteId,
-            final String paragraphId,
-            final String lines
+            BiConsumer<Dataset<Row>, Boolean> batchHandler,
+            BiConsumer<StreamingQuery, StreamingQueryListener.QueryStartedEvent> queryStartedConsumer,
+            BiConsumer<StreamingQuery, StreamingQueryListener.QueryProgressEvent> queryProgressConsumer,
+            BiConsumer<StreamingQuery, StreamingQueryListener.QueryTerminatedEvent> queryTerminatedConsumer,
+            Consumer<String> initialLogConsumer,
+            SparkSession sparkSession,
+            String noteId,
+            String paragraphId,
+            String lines
     ) throws TimeoutException {
         throw new UnsupportedOperationException("Not supported.");
     }