fix(api): make all event listeners accept one parameter (#225)

yury-s · web-flow · commit 808f666399c2 · 2021-01-22T12:49:27.000-08:00
diff --git a/playwright/src/main/java/com/microsoft/playwright/Browser.java b/playwright/src/main/java/com/microsoft/playwright/Browser.java
@@ -18,6 +18,7 @@
 
 import java.nio.file.Path;
 import java.util.*;
+import java.util.function.Consumer;
 
 /**
  * - extends: [EventEmitter]
@@ -44,8 +45,8 @@ public int height() {
   }
 
 
-  void onDisconnected(Runnable handler);
-  void offDisconnected(Runnable handler);
+  void onDisconnected(Consumer<Browser> handler);
+  void offDisconnected(Consumer<Browser> handler);
 
 
   class NewContextOptions {
diff --git a/playwright/src/main/java/com/microsoft/playwright/BrowserContext.java b/playwright/src/main/java/com/microsoft/playwright/BrowserContext.java
@@ -95,8 +95,8 @@ public List<OriginState> origins() {
   }
 
 
-  void onClose(Runnable handler);
-  void offClose(Runnable handler);
+  void onClose(Consumer<BrowserContext> handler);
+  void offClose(Consumer<BrowserContext> handler);
 
   void onPage(Consumer<Page> handler);
   void offPage(Consumer<Page> handler);
diff --git a/playwright/src/main/java/com/microsoft/playwright/Page.java b/playwright/src/main/java/com/microsoft/playwright/Page.java
@@ -75,20 +75,20 @@ interface Error {
   }
 
 
-  void onClose(Runnable handler);
-  void offClose(Runnable handler);
+  void onClose(Consumer<Page> handler);
+  void offClose(Consumer<Page> handler);
 
   void onConsole(Consumer<ConsoleMessage> handler);
   void offConsole(Consumer<ConsoleMessage> handler);
 
-  void onCrash(Runnable handler);
-  void offCrash(Runnable handler);
+  void onCrash(Consumer<Page> handler);
+  void offCrash(Consumer<Page> handler);
 
   void onDialog(Consumer<Dialog> handler);
   void offDialog(Consumer<Dialog> handler);
 
-  void onDomContentLoaded(Runnable handler);
-  void offDomContentLoaded(Runnable handler);
+  void onDOMContentLoaded(Consumer<Page> handler);
+  void offDOMContentLoaded(Consumer<Page> handler);
 
   void onDownload(Consumer<Download> handler);
   void offDownload(Consumer<Download> handler);
@@ -105,8 +105,8 @@ interface Error {
   void onFrameNavigated(Consumer<Frame> handler);
   void offFrameNavigated(Consumer<Frame> handler);
 
-  void onLoad(Runnable handler);
-  void offLoad(Runnable handler);
+  void onLoad(Consumer<Page> handler);
+  void offLoad(Consumer<Page> handler);
 
   void onPageError(Consumer<Error> handler);
   void offPageError(Consumer<Error> handler);
diff --git a/playwright/src/main/java/com/microsoft/playwright/WebSocket.java b/playwright/src/main/java/com/microsoft/playwright/WebSocket.java
@@ -30,8 +30,8 @@ interface FrameData {
   }
 
 
-  void onClose(Runnable handler);
-  void offClose(Runnable handler);
+  void onClose(Consumer<WebSocket> handler);
+  void offClose(Consumer<WebSocket> handler);
 
   void onFrameReceived(Consumer<FrameData> handler);
   void offFrameReceived(Consumer<FrameData> handler);
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java
@@ -60,12 +60,12 @@ enum EventType {
   }
 
   @Override
-  public void onClose(Runnable handler) {
+  public void onClose(Consumer<BrowserContext> handler) {
     listeners.add(EventType.CLOSE, handler);
   }
 
   @Override
-  public void offClose(Runnable handler) {
+  public void offClose(Consumer<BrowserContext> handler) {
     listeners.remove(EventType.CLOSE, handler);
   }
 
@@ -416,7 +416,7 @@ protected void handleEvent(String event, JsonObject params) {
       if (browser != null) {
         browser.contexts.remove(this);
       }
-      listeners.notify(EventType.CLOSE, null);
+      listeners.notify(EventType.CLOSE, this);
     }
   }
 }
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserImpl.java
@@ -27,6 +27,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.function.Consumer;
 
 import static com.microsoft.playwright.impl.Serialization.gson;
 import static com.microsoft.playwright.impl.Utils.convertViaJson;
@@ -46,12 +47,12 @@ enum EventType {
   }
 
   @Override
-  public void onDisconnected(Runnable handler) {
+  public void onDisconnected(Consumer<Browser> handler) {
     listeners.add(EventType.DISCONNECTED, handler);
   }
 
   @Override
-  public void offDisconnected(Runnable handler) {
+  public void offDisconnected(Consumer<Browser> handler) {
     listeners.remove(EventType.DISCONNECTED, handler);
   }
 
@@ -136,7 +137,7 @@ public String version() {
   void handleEvent(String event, JsonObject parameters) {
     if ("close".equals(event)) {
       isConnected = false;
-      listeners.notify(EventType.DISCONNECTED, null);
+      listeners.notify(EventType.DISCONNECTED, this);
     }
   }
 }
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/ListenerCollection.java b/playwright/src/main/java/com/microsoft/playwright/impl/ListenerCollection.java
@@ -47,32 +47,6 @@ public Object data() {
     }
   }
 
-  private static class RunnableWrapper<EventType> implements Listener<EventType> {
-    final Runnable callback;
-
-    private RunnableWrapper(Runnable callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void handle(Event<EventType> event) {
-      callback.run();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
-      RunnableWrapper<?> that = (RunnableWrapper<?>) o;
-      return Objects.equals(callback, that.callback);
-    }
-
-    @Override
-    public int hashCode() {
-      return Objects.hash(callback);
-    }
-  }
-
   private static class ConsumerWrapper<EventType> implements Listener<EventType> {
     final Consumer<?> callback;
 
@@ -98,13 +72,6 @@ public int hashCode() {
     }
   }
 
-  void add(EventType type, Runnable listener) {
-    add(type, new RunnableWrapper<>(listener));
-  }
-  void remove(EventType type, Runnable listener) {
-    remove(type, new RunnableWrapper<>(listener));
-  }
-
   void add(EventType type, Consumer listener) {
     add(type, new ConsumerWrapper<>(listener));
   }
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java
@@ -155,9 +155,9 @@ protected void handleEvent(String event, JsonObject params) {
         }
       }
     } else if ("load".equals(event)) {
-      listeners.notify(EventType.LOAD, null);
+      listeners.notify(EventType.LOAD, this);
     } else if ("domcontentloaded".equals(event)) {
-      listeners.notify(EventType.DOMCONTENTLOADED, null);
+      listeners.notify(EventType.DOMCONTENTLOADED, this);
     } else if ("request".equals(event)) {
       String guid = params.getAsJsonObject("request").get("guid").getAsString();
       Request request = connection.getExistingObject(guid);
@@ -210,11 +210,11 @@ protected void handleEvent(String event, JsonObject params) {
       SerializedError error = gson().fromJson(params.getAsJsonObject("error"), SerializedError.class);
       listeners.notify(EventType.PAGEERROR, new ErrorImpl(error));
     } else if ("crash".equals(event)) {
-      listeners.notify(EventType.CRASH, null);
+      listeners.notify(EventType.CRASH, this);
     } else if ("close".equals(event)) {
       isClosed = true;
       browserContext.pages.remove(this);
-      listeners.notify(EventType.CLOSE, null);
+      listeners.notify(EventType.CLOSE, this);
     }
   }
 
@@ -237,12 +237,12 @@ private void updateFileChooserInterception(boolean enabled) {
   }
 
   @Override
-  public void onClose(Runnable handler) {
+  public void onClose(Consumer<Page> handler) {
     listeners.add(EventType.CLOSE, handler);
   }
 
   @Override
-  public void offClose(Runnable handler) {
+  public void offClose(Consumer<Page> handler) {
     listeners.remove(EventType.CLOSE, handler);
   }
 
@@ -257,12 +257,12 @@ public void offConsole(Consumer<ConsoleMessage> handler) {
   }
 
   @Override
-  public void onCrash(Runnable handler) {
+  public void onCrash(Consumer<Page> handler) {
     listeners.add(EventType.CRASH, handler);
   }
 
   @Override
-  public void offCrash(Runnable handler) {
+  public void offCrash(Consumer<Page> handler) {
     listeners.remove(EventType.CRASH, handler);
   }
 
@@ -277,12 +277,12 @@ public void offDialog(Consumer<Dialog> handler) {
   }
 
   @Override
-  public void onDomContentLoaded(Runnable handler) {
+  public void onDOMContentLoaded(Consumer<Page> handler) {
     listeners.add(EventType.DOMCONTENTLOADED, handler);
   }
 
   @Override
-  public void offDomContentLoaded(Runnable handler) {
+  public void offDOMContentLoaded(Consumer<Page> handler) {
     listeners.remove(EventType.DOMCONTENTLOADED, handler);
   }
 
@@ -337,12 +337,12 @@ public void offFrameNavigated(Consumer<Frame> handler) {
   }
 
   @Override
-  public void onLoad(Runnable handler) {
+  public void onLoad(Consumer<Page> handler) {
     listeners.add(EventType.LOAD, handler);
   }
 
   @Override
-  public void offLoad(Runnable handler) {
+  public void offLoad(Consumer<Page> handler) {
     listeners.remove(EventType.LOAD, handler);
   }
 
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/WebSocketImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/WebSocketImpl.java
@@ -44,12 +44,12 @@ enum EventType {
   }
 
   @Override
-  public void onClose(Runnable handler) {
+  public void onClose(Consumer<WebSocket> handler) {
     listeners.add(EventType.CLOSE, handler);
   }
 
   @Override
-  public void offClose(Runnable handler) {
+  public void offClose(Consumer<WebSocket> handler) {
     listeners.remove(EventType.CLOSE, handler);
   }
 
@@ -212,7 +212,7 @@ void handleEvent(String event, JsonObject parameters) {
       }
       case "close": {
         isClosed = true;
-        listeners.notify(EventType.CLOSE, null);
+        listeners.notify(EventType.CLOSE, this);
         break;
       }
       default: {
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestDefaultBrowserContext2.java b/playwright/src/test/java/com/microsoft/playwright/TestDefaultBrowserContext2.java
@@ -223,7 +223,7 @@ void shouldHandleException() {
   void shouldFireCloseEventForAPersistentContext() {
     launchPersistent();
     boolean[] closed = {false};
-    persistentContext.onClose(() -> closed[0] = true);
+    persistentContext.onClose(context -> closed[0] = true);
     closePersistentContext();
     assertTrue(closed[0]);
   }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestWebSocket.java b/playwright/src/test/java/com/microsoft/playwright/TestWebSocket.java
@@ -101,7 +101,7 @@ void shouldEmitCloseEvents() {
     page.onWebSocket(ws -> {
       log.add("open<" + ws.url() + ">");
       webSocket[0] = ws;
-      ws.onClose(() -> {
+      ws.onClose(ws1 -> {
         log.add("close");
         socketClosed[0] = true;
       });
@@ -123,7 +123,7 @@ void shouldEmitFrameEvents() {
       log.add("open");
       ws.onFrameSent(frameData -> log.add("sent<" + frameData.text() + ">"));
       ws.onFrameReceived(frameData -> log.add("received<" + frameData.text()  + ">"));
-      ws.onClose(() -> { log.add("close"); socketClosed[0] = true; });
+      ws.onClose(ws1 -> { log.add("close"); socketClosed[0] = true; });
     });
     page.evaluate("port => {\n" +
       "    const ws = new WebSocket('ws://localhost:' + port + '/ws');\n" +
@@ -146,7 +146,7 @@ void shouldEmitBinaryFrameEvents() {
     boolean[] socketClosed = {false};
     List<com.microsoft.playwright.WebSocket.FrameData> sent = new ArrayList<>();
     page.onWebSocket(ws -> {
-      ws.onClose(() -> { socketClosed[0] = true; });
+      ws.onClose(ws1 -> socketClosed[0] = true);
       ws.onFrameSent(frameData -> sent.add(frameData));
     });
     page.evaluate("port => {\n" +
diff --git a/tools/api-generator/src/main/java/com/microsoft/playwright/tools/ApiGenerator.java b/tools/api-generator/src/main/java/com/microsoft/playwright/tools/ApiGenerator.java
@@ -375,7 +375,7 @@ class Event extends Element {
     eventNames.put("Page.console", "Console");
     eventNames.put("Page.crash", "Crash");
     eventNames.put("Page.dialog", "Dialog");
-    eventNames.put("Page.domcontentloaded", "DomContentLoaded");
+    eventNames.put("Page.domcontentloaded", "DOMContentLoaded");
     eventNames.put("Page.download", "Download");
     eventNames.put("Page.filechooser", "FileChooser");
     eventNames.put("Page.frameattached", "FrameAttached");
@@ -438,7 +438,12 @@ void writeListenerMethods(List<String> output, String offset) {
       throw new RuntimeException("Unknown event: " + jsonPath);
     }
     String name = eventNames.get(jsonPath);
-    String listenerType = "void".equals(type.toJava()) ? "Runnable" : "Consumer<" + type.toJava() + ">";
+    String paramType = type.toJava();
+    // TODO: remove once fixed upstream
+    if (paramType.equals("void")) {
+      paramType = parent.jsonName;
+    }
+    String listenerType = "Consumer<" + paramType + ">";
     output.add(offset + "void on" + name + "(" + listenerType + " handler);");
     output.add(offset + "void off" + name + "(" + listenerType + " handler);");
   }
@@ -1050,7 +1055,7 @@ void writeTo(List<String> output, String offset) {
       output.add("import java.nio.file.Path;");
     }
     output.add("import java.util.*;");
-    if (asList("Page", "BrowserContext", "WebSocket", "Worker").contains(jsonName)) {
+    if (asList("Page", "Browser", "BrowserContext", "WebSocket", "Worker").contains(jsonName)) {
       output.add("import java.util.function.Consumer;");
     }
     if (asList("Page", "Frame", "BrowserContext", "WebSocket").contains(jsonName)) {

Original file line number	Diff line number	Diff line change
`@@ -95,8 +95,8 @@ public List<OriginState> origins() {`
`95`	`95`	`}`
`96`	`96`
`97`	`97`
`98`		`- void onClose(Runnable handler);`
`99`		`- void offClose(Runnable handler);`
	`98`	`+ void onClose(Consumer<BrowserContext> handler);`
	`99`	`+ void offClose(Consumer<BrowserContext> handler);`
`100`	`100`
`101`	`101`	`void onPage(Consumer<Page> handler);`
`102`	`102`	`void offPage(Consumer<Page> handler);`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ interface FrameData {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`
`33`		`- void onClose(Runnable handler);`
`34`		`- void offClose(Runnable handler);`
	`33`	`+ void onClose(Consumer<WebSocket> handler);`
	`34`	`+ void offClose(Consumer<WebSocket> handler);`
`35`	`35`
`36`	`36`	`void onFrameReceived(Consumer<FrameData> handler);`
`37`	`37`	`void offFrameReceived(Consumer<FrameData> handler);`
Original file line number	Diff line number	Diff line change
`@@ -60,12 +60,12 @@ enum EventType {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`@Override`
`63`		`- public void onClose(Runnable handler) {`
	`63`	`+ public void onClose(Consumer<BrowserContext> handler) {`
`64`	`64`	`listeners.add(EventType.CLOSE, handler);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`@Override`
`68`		`- public void offClose(Runnable handler) {`
	`68`	`+ public void offClose(Consumer<BrowserContext> handler) {`
`69`	`69`	`listeners.remove(EventType.CLOSE, handler);`
`70`	`70`	`}`
`71`	`71`
`@@ -416,7 +416,7 @@ protected void handleEvent(String event, JsonObject params) {`
`416`	`416`	`if (browser != null) {`
`417`	`417`	`browser.contexts.remove(this);`
`418`	`418`	`}`
`419`		`- listeners.notify(EventType.CLOSE, null);`
	`419`	`+ listeners.notify(EventType.CLOSE, this);`
`420`	`420`	`}`
`421`	`421`	`}`
`422`	`422`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`import java.util.HashSet;`
`28`	`28`	`import java.util.List;`
`29`	`29`	`import java.util.Set;`
	`30`	`+import java.util.function.Consumer;`
`30`	`31`
`31`	`32`	`import static com.microsoft.playwright.impl.Serialization.gson;`
`32`	`33`	`import static com.microsoft.playwright.impl.Utils.convertViaJson;`
`@@ -46,12 +47,12 @@ enum EventType {`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`@Override`
`49`		`- public void onDisconnected(Runnable handler) {`
	`50`	`+ public void onDisconnected(Consumer<Browser> handler) {`
`50`	`51`	`listeners.add(EventType.DISCONNECTED, handler);`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`@Override`
`54`		`- public void offDisconnected(Runnable handler) {`
	`55`	`+ public void offDisconnected(Consumer<Browser> handler) {`
`55`	`56`	`listeners.remove(EventType.DISCONNECTED, handler);`
`56`	`57`	`}`
`57`	`58`
`@@ -136,7 +137,7 @@ public String version() {`
`136`	`137`	`void handleEvent(String event, JsonObject parameters) {`
`137`	`138`	`if ("close".equals(event)) {`
`138`	`139`	`isConnected = false;`
`139`		`- listeners.notify(EventType.DISCONNECTED, null);`
	`140`	`+ listeners.notify(EventType.DISCONNECTED, this);`
`140`	`141`	`}`
`141`	`142`	`}`
`142`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -155,9 +155,9 @@ protected void handleEvent(String event, JsonObject params) {`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`	`} else if ("load".equals(event)) {`
`158`		`- listeners.notify(EventType.LOAD, null);`
	`158`	`+ listeners.notify(EventType.LOAD, this);`
`159`	`159`	`} else if ("domcontentloaded".equals(event)) {`
`160`		`- listeners.notify(EventType.DOMCONTENTLOADED, null);`
	`160`	`+ listeners.notify(EventType.DOMCONTENTLOADED, this);`
`161`	`161`	`} else if ("request".equals(event)) {`
`162`	`162`	`String guid = params.getAsJsonObject("request").get("guid").getAsString();`
`163`	`163`	`Request request = connection.getExistingObject(guid);`
`@@ -210,11 +210,11 @@ protected void handleEvent(String event, JsonObject params) {`
`210`	`210`	`SerializedError error = gson().fromJson(params.getAsJsonObject("error"), SerializedError.class);`
`211`	`211`	`listeners.notify(EventType.PAGEERROR, new ErrorImpl(error));`
`212`	`212`	`} else if ("crash".equals(event)) {`
`213`		`- listeners.notify(EventType.CRASH, null);`
	`213`	`+ listeners.notify(EventType.CRASH, this);`
`214`	`214`	`} else if ("close".equals(event)) {`
`215`	`215`	`isClosed = true;`
`216`	`216`	`browserContext.pages.remove(this);`
`217`		`- listeners.notify(EventType.CLOSE, null);`
	`217`	`+ listeners.notify(EventType.CLOSE, this);`
`218`	`218`	`}`
`219`	`219`	`}`
`220`	`220`
`@@ -237,12 +237,12 @@ private void updateFileChooserInterception(boolean enabled) {`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`@Override`
`240`		`- public void onClose(Runnable handler) {`
	`240`	`+ public void onClose(Consumer<Page> handler) {`
`241`	`241`	`listeners.add(EventType.CLOSE, handler);`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`@Override`
`245`		`- public void offClose(Runnable handler) {`
	`245`	`+ public void offClose(Consumer<Page> handler) {`
`246`	`246`	`listeners.remove(EventType.CLOSE, handler);`
`247`	`247`	`}`
`248`	`248`
`@@ -257,12 +257,12 @@ public void offConsole(Consumer<ConsoleMessage> handler) {`
`257`	`257`	`}`
`258`	`258`
`259`	`259`	`@Override`
`260`		`- public void onCrash(Runnable handler) {`
	`260`	`+ public void onCrash(Consumer<Page> handler) {`
`261`	`261`	`listeners.add(EventType.CRASH, handler);`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`@Override`
`265`		`- public void offCrash(Runnable handler) {`
	`265`	`+ public void offCrash(Consumer<Page> handler) {`
`266`	`266`	`listeners.remove(EventType.CRASH, handler);`
`267`	`267`	`}`
`268`	`268`
`@@ -277,12 +277,12 @@ public void offDialog(Consumer<Dialog> handler) {`
`277`	`277`	`}`
`278`	`278`
`279`	`279`	`@Override`
`280`		`- public void onDomContentLoaded(Runnable handler) {`
	`280`	`+ public void onDOMContentLoaded(Consumer<Page> handler) {`
`281`	`281`	`listeners.add(EventType.DOMCONTENTLOADED, handler);`
`282`	`282`	`}`
`283`	`283`
`284`	`284`	`@Override`
`285`		`- public void offDomContentLoaded(Runnable handler) {`
	`285`	`+ public void offDOMContentLoaded(Consumer<Page> handler) {`
`286`	`286`	`listeners.remove(EventType.DOMCONTENTLOADED, handler);`
`287`	`287`	`}`
`288`	`288`
`@@ -337,12 +337,12 @@ public void offFrameNavigated(Consumer<Frame> handler) {`
`337`	`337`	`}`
`338`	`338`
`339`	`339`	`@Override`
`340`		`- public void onLoad(Runnable handler) {`
	`340`	`+ public void onLoad(Consumer<Page> handler) {`
`341`	`341`	`listeners.add(EventType.LOAD, handler);`
`342`	`342`	`}`
`343`	`343`
`344`	`344`	`@Override`
`345`		`- public void offLoad(Runnable handler) {`
	`345`	`+ public void offLoad(Consumer<Page> handler) {`
`346`	`346`	`listeners.remove(EventType.LOAD, handler);`
`347`	`347`	`}`
`348`	`348`
Original file line number	Diff line number	Diff line change
`@@ -44,12 +44,12 @@ enum EventType {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`@Override`
`47`		`- public void onClose(Runnable handler) {`
	`47`	`+ public void onClose(Consumer<WebSocket> handler) {`
`48`	`48`	`listeners.add(EventType.CLOSE, handler);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`@Override`
`52`		`- public void offClose(Runnable handler) {`
	`52`	`+ public void offClose(Consumer<WebSocket> handler) {`
`53`	`53`	`listeners.remove(EventType.CLOSE, handler);`
`54`	`54`	`}`
`55`	`55`
`@@ -212,7 +212,7 @@ void handleEvent(String event, JsonObject parameters) {`
`212`	`212`	`}`
`213`	`213`	`case "close": {`
`214`	`214`	`isClosed = true;`
`215`		`- listeners.notify(EventType.CLOSE, null);`
	`215`	`+ listeners.notify(EventType.CLOSE, this);`
`216`	`216`	`break;`
`217`	`217`	`}`
`218`	`218`	`default: {`
Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ void shouldHandleException() {`
`223`	`223`	`void shouldFireCloseEventForAPersistentContext() {`
`224`	`224`	`launchPersistent();`
`225`	`225`	`boolean[] closed = {false};`
`226`		`- persistentContext.onClose(() -> closed[0] = true);`
	`226`	`+ persistentContext.onClose(context -> closed[0] = true);`
`227`	`227`	`closePersistentContext();`
`228`	`228`	`assertTrue(closed[0]);`
`229`	`229`	`}`