revert console message type change

Author: Skn0tt

playwright/src/main/java/com/microsoft/playwright/ConsoleMessage.java

@@ -16,7 +16,6 @@
 
 package com.microsoft.playwright;
 
-import com.microsoft.playwright.options.*;
 import java.util.*;
 
 /**
@@ -78,6 +77,6 @@ public interface ConsoleMessage {
    *
    * @since v1.8
    */
-  ConsoleMessageType type();
+  String type();
 }
 

playwright/src/main/java/com/microsoft/playwright/impl/ConsoleMessageImpl.java

@@ -20,8 +20,6 @@
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.ConsoleMessage;
 import com.microsoft.playwright.JSHandle;
-import com.microsoft.playwright.PlaywrightException;
-import com.microsoft.playwright.options.ConsoleMessageType;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -42,29 +40,8 @@ public ConsoleMessageImpl(Connection connection, JsonObject initializer) {
     this.initializer = initializer;
   }
 
-  public ConsoleMessageType type() {
-    String value = initializer.get("type").getAsString();
-    switch (value) {
-      case "log": return ConsoleMessageType.LOG;
-      case "debug": return ConsoleMessageType.DEBUG;
-      case "info": return ConsoleMessageType.INFO;
-      case "error": return ConsoleMessageType.ERROR;
-      case "warning": return ConsoleMessageType.WARNING;
-      case "dir": return ConsoleMessageType.DIR;
-      case "dirxml": return ConsoleMessageType.DIRXML;
-      case "table": return ConsoleMessageType.TABLE;
-      case "trace": return ConsoleMessageType.TRACE;
-      case "clear": return ConsoleMessageType.CLEAR;
-      case "startGroup": return ConsoleMessageType.STARTGROUP;
-      case "startGroupCollapsed": return ConsoleMessageType.STARTGROUPCOLLAPSED;
-      case "endGroup": return ConsoleMessageType.ENDGROUP;
-      case "assert": return ConsoleMessageType.ASSERT;
-      case "profile": return ConsoleMessageType.PROFILE;
-      case "profileEnd": return ConsoleMessageType.PROFILEEND;
-      case "count": return ConsoleMessageType.COUNT;
-      case "timeEnd": return ConsoleMessageType.TIMEEND;
-      default: throw new PlaywrightException("Unexpected console message type: " + value);
-    }
+  public String type() {
+    return initializer.get("type").getAsString();
   }
 
   public String text() {

playwright/src/main/java/com/microsoft/playwright/options/ConsoleMessageType.java

@@ -19,8 +19,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
 
-import com.microsoft.playwright.options.ConsoleMessageType;
-
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 
@@ -55,7 +53,7 @@ void consoleEventShouldWorkInPopup() {
   void consoleEventShouldWorkInPopup2() {
     Page[] popup = { null };
     ConsoleMessage message = context.waitForConsoleMessage(
-      new BrowserContext.WaitForConsoleMessageOptions().setPredicate(msg -> msg.type() == ConsoleMessageType.LOG),
+      new BrowserContext.WaitForConsoleMessageOptions().setPredicate(msg -> "log".equals(msg.type())),
       () -> {
         popup[0] = context.waitForPage(() -> {
           page.evaluate("async () => {\n" +

playwright/src/test/java/com/microsoft/playwright/TestBrowserContextEvents.java

@@ -19,8 +19,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
 
-import com.microsoft.playwright.options.ConsoleMessageType;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -42,7 +40,7 @@ void shouldWork() {
     } else {
       assertEquals("hello 5 {foo: bar}", message.text());
     }
-    assertEquals(ConsoleMessageType.LOG, message.type());
+    assertEquals("log", message.type());
     assertEquals("hello", message.args().get(0).jsonValue());
     assertEquals(5, message.args().get(1).jsonValue());
     assertEquals(mapOf("foo", "bar"), message.args().get(2).jsonValue());
@@ -72,13 +70,7 @@ void shouldWorkForDifferentConsoleAPICalls() {
       "    console.error('calling console.error');\n" +
       "    console.log(Promise.resolve('should not wait until resolved!'));\n" +
       "  }");
-    assertEquals(asList(
-      ConsoleMessageType.TIMEEND,
-      ConsoleMessageType.TRACE,
-      ConsoleMessageType.DIR,
-      ConsoleMessageType.WARNING,
-      ConsoleMessageType.ERROR,
-      ConsoleMessageType.LOG),
+    assertEquals(asList("timeEnd", "trace", "dir", "warning", "error", "log"),
       messages.stream().map(msg -> msg.type()).collect(toList()));
     assertTrue(messages.get(0).text().contains("calling console.time"));
 
@@ -112,7 +104,7 @@ void shouldTriggerCorrectLog() {
       page.evaluate("async url => fetch(url).catch(e => {})", server.EMPTY_PAGE);
     });
     assertTrue(message.text().contains("Access-Control-Allow-Origin"));
-    assertEquals(ConsoleMessageType.ERROR, message.type());
+    assertEquals("error", message.type());
   }
 
   @Test
@@ -121,7 +113,7 @@ void shouldHaveLocationForConsoleAPICalls() {
     ConsoleMessage message = page.waitForConsoleMessage(
       new Page.WaitForConsoleMessageOptions().setPredicate(m -> "yellow".equals(m.text())),
       () -> page.navigate(server.PREFIX + "/consolelog.html"));
-    assertEquals(ConsoleMessageType.LOG, message.type());
+    assertEquals("log", message.type());
     // Engines have different column notion.
     assertTrue(message.location().startsWith(server.PREFIX + "/consolelog.html:7:"), message.location());
   }
@@ -130,12 +122,12 @@ void shouldHaveLocationForConsoleAPICalls() {
   void shouldSupportPredicate() {
     page.navigate(server.EMPTY_PAGE);
     ConsoleMessage message = page.waitForConsoleMessage(
-      new Page.WaitForConsoleMessageOptions().setPredicate(m -> m.type() == ConsoleMessageType.INFO),
+      new Page.WaitForConsoleMessageOptions().setPredicate(m -> "info".equals(m.type())),
       () -> {
         page.evaluate("console.log(1)");
         page.evaluate("console.info(2)");
       });
     assertEquals("2", message.text());
-    assertEquals(ConsoleMessageType.INFO, message.type());
+    assertEquals("info", message.type());
   }
 }

playwright/src/test/java/com/microsoft/playwright/TestPageEventConsole.java

@@ -596,6 +596,9 @@ void createEnum(JsonObject jsonObject) {
     if (newEnum.jsonName == null) {
       throw new RuntimeException("Enum without name: " + jsonObject);
     }
+    if ("ConsoleMessageType".equals(newEnum.jsonName)) {
+      return;
+    }
     Map<String, TypeDefinition> enumMap = topLevelTypes();
     TypeDefinition existing = enumMap.putIfAbsent(newEnum.jsonName, newEnum);
     if (existing != null && (!(existing instanceof Enum) || !((Enum) existing).hasSameValues(newEnum))) {
@@ -722,6 +725,11 @@ void writeTo(List<String> output, String offset) {
       output.add("");
       return;
     }
+    if ("ConsoleMessage.type".equals(jsonPath)) {
+      writeJavadoc(params, output, offset);
+      output.add(offset + "String type();");
+      return;
+    }
     int numOverloads = 1;
     for (int i = 0; i < params.size(); i++) {
       if (params.get(i).type.isTypeUnion()) {
@@ -986,7 +994,7 @@ void writeTo(List<String> output, String offset) {
     if (methods.stream().anyMatch(m -> "create".equals(m.jsonName))) {
       output.add("import com.microsoft.playwright.impl." + jsonName + "Impl;");
     }
-    if (asList("Page", "Request", "Response", "APIRequestContext", "APIRequest", "APIResponse", "FileChooser", "Frame", "FrameLocator", "ElementHandle", "Locator", "Browser", "BrowserContext", "BrowserType", "Mouse", "Keyboard", "Tracing", "ConsoleMessage").contains(jsonName)) {
+    if (asList("Page", "Request", "Response", "APIRequestContext", "APIRequest", "APIResponse", "FileChooser", "Frame", "FrameLocator", "ElementHandle", "Locator", "Browser", "BrowserContext", "BrowserType", "Mouse", "Keyboard", "Tracing").contains(jsonName)) {
       output.add("import com.microsoft.playwright.options.*;");
     }
     if ("Download".equals(jsonName)) {