From fdec32c650551030a88d0836561741acdea1affc Mon Sep 17 00:00:00 2001
From: Yury Semikhatsky <yurys@chromium.org>
Date: Thu, 23 Jun 2022 18:59:04 -0700
Subject: [PATCH] chore: simplify handler result (#959)

---
 .../com/microsoft/playwright/impl/BrowserContextImpl.java   | 4 ++--
 .../main/java/com/microsoft/playwright/impl/PageImpl.java   | 4 ++--
 .../src/main/java/com/microsoft/playwright/impl/Router.java | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java
index b4f48233..7f77c576 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java
@@ -481,10 +481,10 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
 
   void handleRoute(RouteImpl route) {
     Router.HandleResult handled = routes.handle(route);
-    if (handled != Router.HandleResult.NoMatchingHandler) {
+    if (handled == Router.HandleResult.FoundMatchingHandler) {
       maybeDisableNetworkInterception();
     }
-    if (handled != Router.HandleResult.Handled){
+    if (!route.isHandled()){
       route.resume();
     }
   }
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java
index 927aa8cc..92466839 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java
@@ -196,10 +196,10 @@ public class PageImpl extends ChannelOwner implements Page {
     } else if ("route".equals(event)) {
       RouteImpl route = connection.getExistingObject(params.getAsJsonObject("route").get("guid").getAsString());
       Router.HandleResult handled = routes.handle(route);
-      if (handled != Router.HandleResult.NoMatchingHandler) {
+      if (handled == Router.HandleResult.FoundMatchingHandler) {
         maybeDisableNetworkInterception();
       }
-      if (handled != Router.HandleResult.Handled) {
+      if (!route.isHandled()) {
         browserContext.handleRoute(route);
       }
     } else if ("video".equals(event)) {
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/Router.java b/playwright/src/main/java/com/microsoft/playwright/impl/Router.java
index 897eadd0..da3b7ab6 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/Router.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/Router.java
@@ -71,19 +71,19 @@ class Router {
     return routes.size();
   }
 
-  enum HandleResult { NoMatchingHandler, MatchedHandlerButNotHandled, Handled }
+  enum HandleResult { NoMatchingHandler, FoundMatchingHandler}
   HandleResult handle(RouteImpl route) {
     HandleResult result = HandleResult.NoMatchingHandler;
     for (Iterator<RouteInfo> it = routes.iterator(); it.hasNext();) {
       RouteInfo info = it.next();
       if (info.handle(route)) {
+        result = HandleResult.FoundMatchingHandler;
         if (info.isDone()) {
           it.remove();
         }
         if (route.isHandled()) {
-          return HandleResult.Handled;
+          break;
         }
-        result = HandleResult.MatchedHandlerButNotHandled;
       }
     }
     return result;