honeymoose/playwright-java
1
0
Fork 0
mirror of synced 2026-08-05 15:06:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: delete Listener interface from implementation (#226)

Browse Source
This commit is contained in:
Yury Semikhatsky
2021-01-22 13:35:11 -08:00
committed by GitHub
parent 808f666399
commit 454b155bbc
9 changed files with 73 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java
+4 -27
View File
@@ -81,8 +81,7 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
private <T> T waitForEventWithTimeout(EventType eventType, Runnable code, Double timeout) {
List<Waitable<T>> waitables = new ArrayList<>();
waitables.add(new WaitableEvent<>(listeners, eventType)
.apply(event -> (T) event.data()));
waitables.add(new WaitableEvent<>(listeners, eventType));
waitables.add(new WaitableContextClose<>());
waitables.add(timeoutSettings.createWaitable(timeout));
return runUntil(code, new WaitableRace<>(waitables));
@@ -349,36 +348,14 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
unroute(new UrlMatcher(url), handler);
}
private class WaitableContextClose<R> implements Waitable<R>, Listener<EventType> {
private String errorMessage;
private class WaitableContextClose<R> extends WaitableEvent<EventType, R> {
WaitableContextClose() {
listeners.add(EventType.CLOSE, this);
}
@Override
public void handle(Event<EventType> event) {
if (EventType.CLOSE == event.type()) {
errorMessage = "Context closed";
} else {
return;
}
dispose();
}
@Override
public boolean isDone() {
return errorMessage != null;
super(BrowserContextImpl.this.listeners, EventType.CLOSE);
}
@Override
public R get() {
throw new PlaywrightException(errorMessage);
}
@Override
public void dispose() {
listeners.remove(EventType.CLOSE, this);
throw new PlaywrightException("Context closed");
}
}
playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java
+6 -8
View File
@@ -26,6 +26,7 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.*;
import java.util.function.Consumer;
import static com.microsoft.playwright.Frame.LoadState.*;
import static com.microsoft.playwright.impl.Serialization.*;
@@ -766,7 +767,7 @@ public class FrameImpl extends ChannelOwner implements Frame {
runUntil(() -> {}, new WaitableRace<>(waitables));
}
private class WaitForLoadStateHelper implements Waitable<Void>, Listener<InternalEventType> {
private class WaitForLoadStateHelper implements Waitable<Void>, Consumer<LoadState> {
private final LoadState expectedState;
private boolean isDone;
@@ -779,9 +780,8 @@ public class FrameImpl extends ChannelOwner implements Frame {
}
@Override
public void handle(Event<InternalEventType> event) {
assert event.type() == InternalEventType.LOADSTATE;
if (expectedState.equals(event.data())) {
public void accept(LoadState state) {
if (expectedState.equals(state)) {
isDone = true;
dispose();
}
@@ -801,7 +801,7 @@ public class FrameImpl extends ChannelOwner implements Frame {
}
}
private class WaitForNavigationHelper implements Waitable<Response>, Listener<InternalEventType> {
private class WaitForNavigationHelper implements Waitable<Response>, Consumer<JsonObject> {
private final UrlMatcher matcher;
private final LoadState expectedLoadState;
private WaitForLoadStateHelper loadStateHelper;
@@ -816,9 +816,7 @@ public class FrameImpl extends ChannelOwner implements Frame {
}
@Override
public void handle(Event<InternalEventType> event) {
assert InternalEventType.NAVIGATED == event.type();
JsonObject params = (JsonObject) event.data();
public void accept(JsonObject params) {
if (!matcher.test(params.get("url").getAsString())) {
return;
}
playwright/src/main/java/com/microsoft/playwright/impl/Listener.java
-23
View File
@@ -1,23 +0,0 @@
/*
* Copyright (c) Microsoft Corporation.
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.microsoft.playwright.impl;
import com.microsoft.playwright.Event;
public interface Listener<EventType> {
void handle(Event<EventType> event);
}
playwright/src/main/java/com/microsoft/playwright/impl/ListenerCollection.java
+13 -56
View File
@@ -16,71 +16,28 @@
package com.microsoft.playwright.impl;
import com.microsoft.playwright.Event;
import java.util.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.function.Consumer;
class ListenerCollection <EventType> {
private final HashMap<EventType, List<Listener<EventType>>> listeners = new HashMap<>();
private final HashMap<EventType, List<Consumer<?>>> listeners = new HashMap<>();
void notify(EventType eventType, Object param) {
List<Listener<EventType>> list = listeners.get(eventType);
<T> void notify(EventType eventType, T param) {
List<Consumer<?>> list = listeners.get(eventType);
if (list == null) {
return;
}
Event<EventType> event = new Event<EventType>() {
@Override
public EventType type() {
return eventType;
}
@Override
public Object data() {
return param;
}
};
for (Listener<EventType> listener: new ArrayList<>(list)) {
listener.handle(event);
for (Consumer<?> listener: new ArrayList<>(list)) {
((Consumer<T>) listener).accept(param);
}
}
private static class ConsumerWrapper<EventType> implements Listener<EventType> {
final Consumer<?> callback;
private ConsumerWrapper(Consumer<?> callback) {
this.callback = callback;
}
@Override
public void handle(Event<EventType> event) {
((Consumer<Object>) callback).accept(event.data());
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
ConsumerWrapper<?> that = (ConsumerWrapper<?>) o;
return Objects.equals(callback, that.callback);
}
@Override
public int hashCode() {
return Objects.hash(callback);
}
}
void add(EventType type, Consumer listener) {
add(type, new ConsumerWrapper<>(listener));
}
void remove(EventType type, Consumer listener) {
remove(type, new ConsumerWrapper<>(listener));
}
void add(EventType type, Listener<EventType> listener) {
List<Listener<EventType>> list = listeners.get(type);
void add(EventType type, Consumer<?> listener) {
List<Consumer<?>> list = listeners.get(type);
if (list == null) {
list = new ArrayList<>();
listeners.put(type, list);
@@ -88,8 +45,8 @@ class ListenerCollection <EventType> {
list.add(listener);
}
void remove(EventType type, Listener<EventType> listener) {
List<Listener<EventType>> list = listeners.get(type);
void remove(EventType type, Consumer<?> listener) {
List<Consumer<?>> list = listeners.get(type);
if (list == null) {
return;
}
playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java
+22 -43
View File
@@ -29,6 +29,7 @@ import java.util.regex.Pattern;
import static com.microsoft.playwright.impl.Serialization.gson;
import static com.microsoft.playwright.impl.Utils.convertViaJson;
import static com.microsoft.playwright.impl.Utils.isSafeCloseError;
import static java.util.Arrays.asList;
public class PageImpl extends ChannelOwner implements Page {
@@ -43,7 +44,7 @@ public class PageImpl extends ChannelOwner implements Page {
private final Set<FrameImpl> frames = new LinkedHashSet<>();
private final ListenerCollection<EventType> listeners = new ListenerCollection<EventType>() {
@Override
void add(EventType eventType, Listener<EventType> listener) {
void add(EventType eventType, Consumer<?> listener) {
if (eventType == EventType.FILECHOOSER) {
willAddFileChooserListener();
}
@@ -51,7 +52,7 @@ public class PageImpl extends ChannelOwner implements Page {
}
@Override
void remove(EventType eventType, Listener<EventType> listener) {
void remove(EventType eventType, Consumer<?> listener) {
super.remove(eventType, listener);
if (eventType == EventType.FILECHOOSER) {
didRemoveFileChooserListener();
@@ -444,8 +445,7 @@ public class PageImpl extends ChannelOwner implements Page {
private <T> T waitForEventWithTimeout(EventType eventType, Runnable code, Double timeout) {
List<Waitable<T>> waitables = new ArrayList<>();
waitables.add(new WaitableEvent<>(listeners, eventType)
.apply(event -> (T) event.data()));
waitables.add(new WaitableEvent<>(listeners, eventType));
waitables.add(createWaitForCloseHelper());
waitables.add(createWaitableTimeout(timeout));
return runUntil(code, new WaitableRace<>(waitables));
@@ -1219,13 +1219,13 @@ public class PageImpl extends ChannelOwner implements Page {
}
}
private class WaitableFrameDetach extends WaitableEvent<EventType> {
private class WaitableFrameDetach extends WaitableEvent<EventType, Frame> {
WaitableFrameDetach(Frame frameArg) {
super(PageImpl.this.listeners, EventType.FRAMEDETACHED, event -> frameArg.equals(event.data()));
super(PageImpl.this.listeners, EventType.FRAMEDETACHED, detachedFrame -> frameArg.equals(detachedFrame));
}
@Override
public Event<EventType> get() {
public Frame get() {
throw new PlaywrightException("Navigating frame was detached");
}
}
@@ -1237,47 +1237,28 @@ public class PageImpl extends ChannelOwner implements Page {
}
<T> Waitable<T> createWaitForCloseHelper() {
return new WaitablePageClose<T>();
return new WaitableRace<T>(asList(new WaitablePageClose(), new WaitablePageCrash()));
}
private class WaitablePageClose<R> implements Waitable<R>, Listener<EventType> {
private final List<EventType> subscribedEvents;
private String errorMessage;
private class WaitablePageClose<T> extends WaitableEvent<EventType, T> {
WaitablePageClose() {
subscribedEvents = Arrays.asList(EventType.CLOSE, EventType.CRASH);
for (EventType e : subscribedEvents) {
listeners.add(e, this);
}
super(PageImpl.this.listeners, EventType.CLOSE);
}
@Override
public void handle(Event<EventType> event) {
if (EventType.CLOSE == event.type()) {
errorMessage = "Page closed";
} else if (EventType.CRASH == event.type()) {
errorMessage = "Page crashed";
} else {
return;
}
dispose();
public T get() {
throw new PlaywrightException("Page closed");
}
}
private class WaitablePageCrash<T> extends WaitableEvent<EventType, T> {
WaitablePageCrash() {
super(PageImpl.this.listeners, EventType.CRASH);
}
@Override
public boolean isDone() {
return errorMessage != null;
}
@Override
public R get() {
throw new PlaywrightException(errorMessage);
}
@Override
public void dispose() {
for (EventType e : subscribedEvents) {
listeners.remove(e, this);
}
public T get() {
throw new PlaywrightException("Page crashed");
}
}
@@ -1306,8 +1287,7 @@ public class PageImpl extends ChannelOwner implements Page {
}
List<Waitable<Request>> waitables = new ArrayList<>();
waitables.add(new WaitableEvent<>(listeners, EventType.REQUEST,
e -> predicate == null || predicate.test(((Request) e.data())))
.apply(event -> (Request) event.data()));
request -> predicate == null || predicate.test(request)));
waitables.add(createWaitForCloseHelper());
waitables.add(createWaitableTimeout(options.timeout));
return runUntil(code, new WaitableRace<>(waitables));
@@ -1338,8 +1318,7 @@ public class PageImpl extends ChannelOwner implements Page {
}
List<Waitable<Response>> waitables = new ArrayList<>();
waitables.add(new WaitableEvent<>(listeners, EventType.RESPONSE,
e -> predicate == null || predicate.test(((Response) e.data())))
.apply(event -> (Response) event.data()));
response -> predicate == null || predicate.test(response)));
waitables.add(createWaitForCloseHelper());
waitables.add(createWaitableTimeout(options.timeout));
return runUntil(code, new WaitableRace<>(waitables));
playwright/src/main/java/com/microsoft/playwright/impl/WaitableEvent.java
+11 -11
View File
@@ -18,19 +18,20 @@ package com.microsoft.playwright.impl;
import com.microsoft.playwright.Event;
import java.util.function.Consumer;
import java.util.function.Predicate;
class WaitableEvent<EventType> implements Waitable<Event<EventType>>, Listener<EventType> {
class WaitableEvent<EventType, T> implements Waitable<T>, Consumer<T> {
final ListenerCollection<EventType> listeners;
private final EventType type;
private final Predicate<Event<EventType>> predicate;
private Event<EventType> event;
private final Predicate<T> predicate;
private T eventArg;
WaitableEvent(ListenerCollection<EventType> listeners, EventType type) {
this(listeners, type, null);
}
WaitableEvent(ListenerCollection<EventType> listeners, EventType type, Predicate<Event<EventType>> predicate) {
WaitableEvent(ListenerCollection<EventType> listeners, EventType type, Predicate<T> predicate) {
this.listeners = listeners;
this.type = type;
this.predicate = predicate;
@@ -38,19 +39,18 @@ class WaitableEvent<EventType> implements Waitable<Event<EventType>>, Listener<E
}
@Override
public void handle(Event<EventType> event) {
assert type.equals(event.type());
if (predicate != null && !predicate.test(event)) {
public void accept(T eventArg) {
if (predicate != null && !predicate.test(eventArg)) {
return;
}
this.event = event;
this.eventArg = eventArg;
dispose();
}
@Override
public boolean isDone() {
return event != null;
return eventArg != null;
}
@Override
@@ -59,7 +59,7 @@ class WaitableEvent<EventType> implements Waitable<Event<EventType>>, Listener<E
}
@Override
public Event<EventType> get() {
return event;
public T get() {
return eventArg;
}
}
playwright/src/main/java/com/microsoft/playwright/impl/WaitableRace.java
-1
View File
@@ -16,7 +16,6 @@
package com.microsoft.playwright.impl;
import java.util.Arrays;
import java.util.Collection;
class WaitableRace<T> implements Waitable<T> {
playwright/src/main/java/com/microsoft/playwright/impl/WebSocketImpl.java
+16 -35
View File
@@ -117,51 +117,32 @@ class WebSocketImpl extends ChannelOwner implements WebSocket {
return initializer.get("url").getAsString();
}
private class WaitableWebSocketError<R> implements Waitable<R>, Listener<EventType> {
private final List<EventType> subscribedEvents;
private String errorMessage;
private class WaitableWebSocketClose<T> extends WaitableEvent<EventType, T> {
WaitableWebSocketClose() {
super(WebSocketImpl.this.listeners, EventType.CLOSE);
}
@Override
public T get() {
throw new PlaywrightException("Socket closed");
}
}
private class WaitableWebSocketError<T> extends WaitableEvent<EventType, T> {
WaitableWebSocketError() {
subscribedEvents = Arrays.asList(EventType.CLOSE, EventType.SOCKETERROR);
for (EventType e : subscribedEvents) {
listeners.add(e, this);
}
super(WebSocketImpl.this.listeners, EventType.SOCKETERROR);
}
@Override
public void handle(Event<EventType> event) {
if (EventType.SOCKETERROR == event.type()) {
errorMessage = "Socket error";
} else if (EventType.CLOSE == event.type()) {
errorMessage = "Socket closed";
} else {
return;
}
dispose();
}
@Override
public boolean isDone() {
return errorMessage != null;
}
@Override
public R get() {
throw new PlaywrightException(errorMessage);
}
@Override
public void dispose() {
for (EventType e : subscribedEvents) {
listeners.remove(e, this);
}
public T get() {
throw new PlaywrightException("Socket error");
}
}
private <T> T waitForEventWithTimeout(EventType eventType, Runnable code, Double timeout) {
List<Waitable<T>> waitables = new ArrayList<>();
waitables.add(new WaitableEvent<>(listeners, eventType)
.apply(event -> (T) event.data()));
waitables.add(new WaitableEvent<>(listeners, eventType));
waitables.add(new WaitableWebSocketClose<>());
waitables.add(new WaitableWebSocketError<>());
waitables.add(page.createWaitForCloseHelper());
waitables.add(page.createWaitableTimeout(timeout));
playwright/src/main/java/com/microsoft/playwright/impl/WorkerImpl.java
+1 -2
View File
@@ -52,8 +52,7 @@ class WorkerImpl extends ChannelOwner implements Worker {
private <T> T waitForEventWithTimeout(EventType eventType, Runnable code, Double timeout) {
List<Waitable<T>> waitables = new ArrayList<>();
waitables.add(new WaitableEvent<>(listeners, eventType)
.apply(event -> (T) event.data()));
waitables.add(new WaitableEvent<>(listeners, eventType));
waitables.add(page.createWaitForCloseHelper());
waitables.add(page.createWaitableTimeout(timeout));
return runUntil(code, new WaitableRace<>(waitables));