From b77b9b0d201527df5d6fb3d6447a3e87f15d06f3 Mon Sep 17 00:00:00 2001
From: Yury Semikhatsky <yurys@chromium.org>
Date: Mon, 8 Feb 2021 18:33:38 -0800
Subject: [PATCH] chore: move enums and second level nested classes into
 options package (#267)

---
 .../src/main/java/com/microsoft/playwright/Browser.java     | 1 +
 .../main/java/com/microsoft/playwright/BrowserContext.java  | 1 +
 .../src/main/java/com/microsoft/playwright/BrowserType.java | 1 +
 .../main/java/com/microsoft/playwright/ElementHandle.java   | 1 +
 .../src/main/java/com/microsoft/playwright/Frame.java       | 1 +
 .../src/main/java/com/microsoft/playwright/Keyboard.java    | 1 +
 .../src/main/java/com/microsoft/playwright/Mouse.java       | 1 +
 playwright/src/main/java/com/microsoft/playwright/Page.java | 1 +
 .../com/microsoft/playwright/impl/BrowserContextImpl.java   | 1 +
 .../com/microsoft/playwright/impl/ElementHandleImpl.java    | 6 +++---
 .../main/java/com/microsoft/playwright/impl/FrameImpl.java  | 3 ++-
 .../main/java/com/microsoft/playwright/impl/PageImpl.java   | 5 +++--
 .../java/com/microsoft/playwright/impl/Serialization.java   | 1 +
 .../com/microsoft/playwright/{ => options}/ColorScheme.java | 2 +-
 .../microsoft/playwright/{ => options}/ElementState.java    | 2 +-
 .../com/microsoft/playwright/{ => options}/Geolocation.java | 2 +-
 .../playwright/{ => options}/KeyboardModifier.java          | 2 +-
 .../com/microsoft/playwright/{ => options}/LoadState.java   | 2 +-
 .../java/com/microsoft/playwright/{ => options}/Media.java  | 2 +-
 .../com/microsoft/playwright/{ => options}/MouseButton.java | 2 +-
 .../com/microsoft/playwright/{ => options}/Position.java    | 2 +-
 .../playwright/{ => options}/SameSiteAttribute.java         | 2 +-
 .../microsoft/playwright/{ => options}/ScreenshotType.java  | 2 +-
 .../playwright/{ => options}/WaitForSelectorState.java      | 2 +-
 .../microsoft/playwright/{ => options}/WaitUntilState.java  | 2 +-
 .../com/microsoft/playwright/TestBrowserContextCookies.java | 1 +
 .../src/test/java/com/microsoft/playwright/TestClick.java   | 4 ++--
 .../microsoft/playwright/TestDefaultBrowserContext2.java    | 3 ++-
 .../test/java/com/microsoft/playwright/TestDownload.java    | 2 +-
 .../microsoft/playwright/TestElementHandleOwnerFrame.java   | 2 +-
 .../playwright/TestElementHandleQuerySelector.java          | 2 +-
 .../playwright/TestElementHandleWaitForElementState.java    | 2 +-
 .../java/com/microsoft/playwright/TestFrameNavigate.java    | 2 +-
 .../test/java/com/microsoft/playwright/TestGeolocation.java | 1 +
 .../src/test/java/com/microsoft/playwright/TestHar.java     | 2 +-
 .../test/java/com/microsoft/playwright/TestPageBasic.java   | 4 ++--
 .../java/com/microsoft/playwright/TestPageEmulateMedia.java | 6 +++---
 .../com/microsoft/playwright/TestPageExposeFunction.java    | 2 +-
 .../com/microsoft/playwright/TestPageWaitForNavigation.java | 1 +
 .../src/test/java/com/microsoft/playwright/TestPopup.java   | 2 +-
 .../src/test/java/com/microsoft/playwright/TestTap.java     | 2 +-
 .../java/com/microsoft/playwright/tools/ApiGenerator.java   | 6 +++++-
 42 files changed, 56 insertions(+), 36 deletions(-)
 rename playwright/src/main/java/com/microsoft/playwright/{ => options}/ColorScheme.java (93%)
 rename playwright/src/main/java/com/microsoft/playwright/{ => options}/ElementState.java (94%)
 rename playwright/src/main/java/com/microsoft/playwright/{ => options}/Geolocation.java (96%)
 rename playwright/src/main/java/com/microsoft/playwright/{ => options}/KeyboardModifier.java (93%)
 rename playwright/src/main/java/com/microsoft/playwright/{ => options}/LoadState.java (93%)
 rename playwright/src/main/java/com/microsoft/playwright/{ => options}/Media.java (93%)
 rename playwright/src/main/java/com/microsoft/playwright/{ => options}/MouseButton.java (93%)
 rename playwright/src/main/java/com/microsoft/playwright/{ => options}/Position.java (95%)
 rename playwright/src/main/java/com/microsoft/playwright/{ => options}/SameSiteAttribute.java (93%)
 rename playwright/src/main/java/com/microsoft/playwright/{ => options}/ScreenshotType.java (93%)
 rename playwright/src/main/java/com/microsoft/playwright/{ => options}/WaitForSelectorState.java (94%)
 rename playwright/src/main/java/com/microsoft/playwright/{ => options}/WaitUntilState.java (94%)

diff --git a/playwright/src/main/java/com/microsoft/playwright/Browser.java b/playwright/src/main/java/com/microsoft/playwright/Browser.java
index 09cd7904..5b7376f5 100644
--- a/playwright/src/main/java/com/microsoft/playwright/Browser.java
+++ b/playwright/src/main/java/com/microsoft/playwright/Browser.java
@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.*;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.function.Consumer;
diff --git a/playwright/src/main/java/com/microsoft/playwright/BrowserContext.java b/playwright/src/main/java/com/microsoft/playwright/BrowserContext.java
index 08e3996e..d231909a 100644
--- a/playwright/src/main/java/com/microsoft/playwright/BrowserContext.java
+++ b/playwright/src/main/java/com/microsoft/playwright/BrowserContext.java
@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.*;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.function.Consumer;
diff --git a/playwright/src/main/java/com/microsoft/playwright/BrowserType.java b/playwright/src/main/java/com/microsoft/playwright/BrowserType.java
index ba70d087..74971dd6 100644
--- a/playwright/src/main/java/com/microsoft/playwright/BrowserType.java
+++ b/playwright/src/main/java/com/microsoft/playwright/BrowserType.java
@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.*;
 import java.nio.file.Path;
 import java.util.*;
 
diff --git a/playwright/src/main/java/com/microsoft/playwright/ElementHandle.java b/playwright/src/main/java/com/microsoft/playwright/ElementHandle.java
index cb4df859..cd010700 100644
--- a/playwright/src/main/java/com/microsoft/playwright/ElementHandle.java
+++ b/playwright/src/main/java/com/microsoft/playwright/ElementHandle.java
@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.*;
 import java.nio.file.Path;
 import java.util.*;
 
diff --git a/playwright/src/main/java/com/microsoft/playwright/Frame.java b/playwright/src/main/java/com/microsoft/playwright/Frame.java
index 486cb618..069038ea 100644
--- a/playwright/src/main/java/com/microsoft/playwright/Frame.java
+++ b/playwright/src/main/java/com/microsoft/playwright/Frame.java
@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.*;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.function.Predicate;
diff --git a/playwright/src/main/java/com/microsoft/playwright/Keyboard.java b/playwright/src/main/java/com/microsoft/playwright/Keyboard.java
index 4f28f60c..0853cdda 100644
--- a/playwright/src/main/java/com/microsoft/playwright/Keyboard.java
+++ b/playwright/src/main/java/com/microsoft/playwright/Keyboard.java
@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.*;
 import java.util.*;
 
 /**
diff --git a/playwright/src/main/java/com/microsoft/playwright/Mouse.java b/playwright/src/main/java/com/microsoft/playwright/Mouse.java
index 23d5f74a..cf364106 100644
--- a/playwright/src/main/java/com/microsoft/playwright/Mouse.java
+++ b/playwright/src/main/java/com/microsoft/playwright/Mouse.java
@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.*;
 import java.util.*;
 
 /**
diff --git a/playwright/src/main/java/com/microsoft/playwright/Page.java b/playwright/src/main/java/com/microsoft/playwright/Page.java
index c0113509..e967e5d7 100644
--- a/playwright/src/main/java/com/microsoft/playwright/Page.java
+++ b/playwright/src/main/java/com/microsoft/playwright/Page.java
@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.*;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.function.Consumer;
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 ea96ab1c..5dcfd93d 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java
@@ -20,6 +20,7 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.*;
+import com.microsoft.playwright.options.*;
 
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/ElementHandleImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/ElementHandleImpl.java
index be429d93..b9a4fd2c 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/ElementHandleImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/ElementHandleImpl.java
@@ -20,7 +20,7 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.ElementHandle;
-import com.microsoft.playwright.ElementState;
+import com.microsoft.playwright.options.ElementState;
 import com.microsoft.playwright.FileChooser;
 import com.microsoft.playwright.Frame;
 
@@ -29,8 +29,8 @@ import java.util.ArrayList;
 import java.util.Base64;
 import java.util.List;
 
-import static com.microsoft.playwright.ScreenshotType.JPEG;
-import static com.microsoft.playwright.ScreenshotType.PNG;
+import static com.microsoft.playwright.options.ScreenshotType.JPEG;
+import static com.microsoft.playwright.options.ScreenshotType.PNG;
 import static com.microsoft.playwright.impl.Serialization.*;
 
 public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java
index 7d29a70d..7eda1662 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java
@@ -20,6 +20,7 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.*;
+import com.microsoft.playwright.options.*;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -28,7 +29,7 @@ import java.nio.file.Path;
 import java.util.*;
 import java.util.function.Consumer;
 
-import static com.microsoft.playwright.LoadState.*;
+import static com.microsoft.playwright.options.LoadState.*;
 import static com.microsoft.playwright.impl.Serialization.*;
 import static com.microsoft.playwright.impl.Utils.convertViaJson;
 import static com.microsoft.playwright.impl.Utils.isFunctionBody;
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 6b7753bb..746ae114 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java
@@ -19,6 +19,7 @@ package com.microsoft.playwright.impl;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.*;
+import com.microsoft.playwright.options.*;
 
 import java.nio.file.Path;
 import java.util.*;
@@ -26,8 +27,8 @@ import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import static com.microsoft.playwright.ScreenshotType.JPEG;
-import static com.microsoft.playwright.ScreenshotType.PNG;
+import static com.microsoft.playwright.options.ScreenshotType.JPEG;
+import static com.microsoft.playwright.options.ScreenshotType.PNG;
 import static com.microsoft.playwright.impl.Serialization.gson;
 import static com.microsoft.playwright.impl.Utils.convertViaJson;
 import static com.microsoft.playwright.impl.Utils.isSafeCloseError;
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/Serialization.java b/playwright/src/main/java/com/microsoft/playwright/impl/Serialization.java
index b4d4dca1..04a2936b 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/Serialization.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/Serialization.java
@@ -20,6 +20,7 @@ import com.google.gson.*;
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
+import com.microsoft.playwright.options.*;
 import com.microsoft.playwright.*;
 
 import java.io.ByteArrayOutputStream;
diff --git a/playwright/src/main/java/com/microsoft/playwright/ColorScheme.java b/playwright/src/main/java/com/microsoft/playwright/options/ColorScheme.java
similarity index 93%
rename from playwright/src/main/java/com/microsoft/playwright/ColorScheme.java
rename to playwright/src/main/java/com/microsoft/playwright/options/ColorScheme.java
index 3d35f664..a657704b 100644
--- a/playwright/src/main/java/com/microsoft/playwright/ColorScheme.java
+++ b/playwright/src/main/java/com/microsoft/playwright/options/ColorScheme.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright;
+package com.microsoft.playwright.options;
 
 public enum ColorScheme {
   LIGHT,
diff --git a/playwright/src/main/java/com/microsoft/playwright/ElementState.java b/playwright/src/main/java/com/microsoft/playwright/options/ElementState.java
similarity index 94%
rename from playwright/src/main/java/com/microsoft/playwright/ElementState.java
rename to playwright/src/main/java/com/microsoft/playwright/options/ElementState.java
index 98363720..6fca3bff 100644
--- a/playwright/src/main/java/com/microsoft/playwright/ElementState.java
+++ b/playwright/src/main/java/com/microsoft/playwright/options/ElementState.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright;
+package com.microsoft.playwright.options;
 
 public enum ElementState {
   VISIBLE,
diff --git a/playwright/src/main/java/com/microsoft/playwright/Geolocation.java b/playwright/src/main/java/com/microsoft/playwright/options/Geolocation.java
similarity index 96%
rename from playwright/src/main/java/com/microsoft/playwright/Geolocation.java
rename to playwright/src/main/java/com/microsoft/playwright/options/Geolocation.java
index 80eb2ae7..75cc3784 100644
--- a/playwright/src/main/java/com/microsoft/playwright/Geolocation.java
+++ b/playwright/src/main/java/com/microsoft/playwright/options/Geolocation.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright;
+package com.microsoft.playwright.options;
 
 public class Geolocation {
   public double latitude;
diff --git a/playwright/src/main/java/com/microsoft/playwright/KeyboardModifier.java b/playwright/src/main/java/com/microsoft/playwright/options/KeyboardModifier.java
similarity index 93%
rename from playwright/src/main/java/com/microsoft/playwright/KeyboardModifier.java
rename to playwright/src/main/java/com/microsoft/playwright/options/KeyboardModifier.java
index 5f84331c..fa301494 100644
--- a/playwright/src/main/java/com/microsoft/playwright/KeyboardModifier.java
+++ b/playwright/src/main/java/com/microsoft/playwright/options/KeyboardModifier.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright;
+package com.microsoft.playwright.options;
 
 public enum KeyboardModifier {
   ALT,
diff --git a/playwright/src/main/java/com/microsoft/playwright/LoadState.java b/playwright/src/main/java/com/microsoft/playwright/options/LoadState.java
similarity index 93%
rename from playwright/src/main/java/com/microsoft/playwright/LoadState.java
rename to playwright/src/main/java/com/microsoft/playwright/options/LoadState.java
index 1247ab84..f7278d02 100644
--- a/playwright/src/main/java/com/microsoft/playwright/LoadState.java
+++ b/playwright/src/main/java/com/microsoft/playwright/options/LoadState.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright;
+package com.microsoft.playwright.options;
 
 public enum LoadState {
   LOAD,
diff --git a/playwright/src/main/java/com/microsoft/playwright/Media.java b/playwright/src/main/java/com/microsoft/playwright/options/Media.java
similarity index 93%
rename from playwright/src/main/java/com/microsoft/playwright/Media.java
rename to playwright/src/main/java/com/microsoft/playwright/options/Media.java
index 18270351..e238d347 100644
--- a/playwright/src/main/java/com/microsoft/playwright/Media.java
+++ b/playwright/src/main/java/com/microsoft/playwright/options/Media.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright;
+package com.microsoft.playwright.options;
 
 public enum Media {
   SCREEN,
diff --git a/playwright/src/main/java/com/microsoft/playwright/MouseButton.java b/playwright/src/main/java/com/microsoft/playwright/options/MouseButton.java
similarity index 93%
rename from playwright/src/main/java/com/microsoft/playwright/MouseButton.java
rename to playwright/src/main/java/com/microsoft/playwright/options/MouseButton.java
index 42d2ded1..83b41db7 100644
--- a/playwright/src/main/java/com/microsoft/playwright/MouseButton.java
+++ b/playwright/src/main/java/com/microsoft/playwright/options/MouseButton.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright;
+package com.microsoft.playwright.options;
 
 public enum MouseButton {
   LEFT,
diff --git a/playwright/src/main/java/com/microsoft/playwright/Position.java b/playwright/src/main/java/com/microsoft/playwright/options/Position.java
similarity index 95%
rename from playwright/src/main/java/com/microsoft/playwright/Position.java
rename to playwright/src/main/java/com/microsoft/playwright/options/Position.java
index 99eee841..21a8cf88 100644
--- a/playwright/src/main/java/com/microsoft/playwright/Position.java
+++ b/playwright/src/main/java/com/microsoft/playwright/options/Position.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright;
+package com.microsoft.playwright.options;
 
 public class Position {
   public int x;
diff --git a/playwright/src/main/java/com/microsoft/playwright/SameSiteAttribute.java b/playwright/src/main/java/com/microsoft/playwright/options/SameSiteAttribute.java
similarity index 93%
rename from playwright/src/main/java/com/microsoft/playwright/SameSiteAttribute.java
rename to playwright/src/main/java/com/microsoft/playwright/options/SameSiteAttribute.java
index eadd2d0f..697d4323 100644
--- a/playwright/src/main/java/com/microsoft/playwright/SameSiteAttribute.java
+++ b/playwright/src/main/java/com/microsoft/playwright/options/SameSiteAttribute.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright;
+package com.microsoft.playwright.options;
 
 public enum SameSiteAttribute {
   STRICT,
diff --git a/playwright/src/main/java/com/microsoft/playwright/ScreenshotType.java b/playwright/src/main/java/com/microsoft/playwright/options/ScreenshotType.java
similarity index 93%
rename from playwright/src/main/java/com/microsoft/playwright/ScreenshotType.java
rename to playwright/src/main/java/com/microsoft/playwright/options/ScreenshotType.java
index f9528dd4..6c21e8d8 100644
--- a/playwright/src/main/java/com/microsoft/playwright/ScreenshotType.java
+++ b/playwright/src/main/java/com/microsoft/playwright/options/ScreenshotType.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright;
+package com.microsoft.playwright.options;
 
 public enum ScreenshotType {
   PNG,
diff --git a/playwright/src/main/java/com/microsoft/playwright/WaitForSelectorState.java b/playwright/src/main/java/com/microsoft/playwright/options/WaitForSelectorState.java
similarity index 94%
rename from playwright/src/main/java/com/microsoft/playwright/WaitForSelectorState.java
rename to playwright/src/main/java/com/microsoft/playwright/options/WaitForSelectorState.java
index 3e3ff1cf..95f7694f 100644
--- a/playwright/src/main/java/com/microsoft/playwright/WaitForSelectorState.java
+++ b/playwright/src/main/java/com/microsoft/playwright/options/WaitForSelectorState.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright;
+package com.microsoft.playwright.options;
 
 public enum WaitForSelectorState {
   ATTACHED,
diff --git a/playwright/src/main/java/com/microsoft/playwright/WaitUntilState.java b/playwright/src/main/java/com/microsoft/playwright/options/WaitUntilState.java
similarity index 94%
rename from playwright/src/main/java/com/microsoft/playwright/WaitUntilState.java
rename to playwright/src/main/java/com/microsoft/playwright/options/WaitUntilState.java
index 54730723..77cd938e 100644
--- a/playwright/src/main/java/com/microsoft/playwright/WaitUntilState.java
+++ b/playwright/src/main/java/com/microsoft/playwright/options/WaitUntilState.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright;
+package com.microsoft.playwright.options;
 
 public enum WaitUntilState {
   LOAD,
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextCookies.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextCookies.java
index f301e958..7fad83a0 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextCookies.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextCookies.java
@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.SameSiteAttribute;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
 
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestClick.java b/playwright/src/test/java/com/microsoft/playwright/TestClick.java
index 3282a057..20794a25 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestClick.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestClick.java
@@ -23,8 +23,8 @@ import org.junit.jupiter.api.condition.EnabledIf;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.microsoft.playwright.KeyboardModifier.SHIFT;
-import static com.microsoft.playwright.MouseButton.RIGHT;
+import static com.microsoft.playwright.options.KeyboardModifier.SHIFT;
+import static com.microsoft.playwright.options.MouseButton.RIGHT;
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
 import static org.junit.jupiter.api.Assertions.*;
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestDefaultBrowserContext2.java b/playwright/src/test/java/com/microsoft/playwright/TestDefaultBrowserContext2.java
index a5c99bf3..7a43e29c 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestDefaultBrowserContext2.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestDefaultBrowserContext2.java
@@ -1,5 +1,6 @@
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.Geolocation;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
@@ -12,7 +13,7 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 
-import static com.microsoft.playwright.ColorScheme.DARK;
+import static com.microsoft.playwright.options.ColorScheme.DARK;
 import static com.microsoft.playwright.Utils.mapOf;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestDownload.java b/playwright/src/test/java/com/microsoft/playwright/TestDownload.java
index 22e40d99..70660117 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestDownload.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestDownload.java
@@ -31,7 +31,7 @@ import java.nio.file.Paths;
 import java.time.Duration;
 import java.time.Instant;
 
-import static com.microsoft.playwright.KeyboardModifier.ALT;
+import static com.microsoft.playwright.options.KeyboardModifier.ALT;
 import static com.microsoft.playwright.Utils.copy;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.nio.file.Files.readAllBytes;
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestElementHandleOwnerFrame.java b/playwright/src/test/java/com/microsoft/playwright/TestElementHandleOwnerFrame.java
index 4aa54a1b..5d6f3851 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestElementHandleOwnerFrame.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestElementHandleOwnerFrame.java
@@ -18,7 +18,7 @@ package com.microsoft.playwright;
 
 import org.junit.jupiter.api.Test;
 
-import static com.microsoft.playwright.LoadState.DOMCONTENTLOADED;
+import static com.microsoft.playwright.options.LoadState.DOMCONTENTLOADED;
 import static com.microsoft.playwright.Utils.attachFrame;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestElementHandleQuerySelector.java b/playwright/src/test/java/com/microsoft/playwright/TestElementHandleQuerySelector.java
index d846ee2e..d0de7f0a 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestElementHandleQuerySelector.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestElementHandleQuerySelector.java
@@ -6,7 +6,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static com.microsoft.playwright.LoadState.DOMCONTENTLOADED;
+import static com.microsoft.playwright.options.LoadState.DOMCONTENTLOADED;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class TestElementHandleQuerySelector extends TestBase {
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestElementHandleWaitForElementState.java b/playwright/src/test/java/com/microsoft/playwright/TestElementHandleWaitForElementState.java
index 0a9d851d..d63f86cf 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestElementHandleWaitForElementState.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestElementHandleWaitForElementState.java
@@ -19,7 +19,7 @@ package com.microsoft.playwright;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
 
-import static com.microsoft.playwright.ElementState.*;
+import static com.microsoft.playwright.options.ElementState.*;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestFrameNavigate.java b/playwright/src/test/java/com/microsoft/playwright/TestFrameNavigate.java
index adcc5698..bc2a99e8 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestFrameNavigate.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestFrameNavigate.java
@@ -18,7 +18,7 @@ package com.microsoft.playwright;
 
 import org.junit.jupiter.api.Test;
 
-import static com.microsoft.playwright.WaitUntilState.NETWORKIDLE;
+import static com.microsoft.playwright.options.WaitUntilState.NETWORKIDLE;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestGeolocation.java b/playwright/src/test/java/com/microsoft/playwright/TestGeolocation.java
index 178573c1..2b39b1d2 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestGeolocation.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestGeolocation.java
@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.Geolocation;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestHar.java b/playwright/src/test/java/com/microsoft/playwright/TestHar.java
index ef6815c3..5ff0bf3c 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestHar.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestHar.java
@@ -29,7 +29,7 @@ import java.io.Reader;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import static com.microsoft.playwright.LoadState.DOMCONTENTLOADED;
+import static com.microsoft.playwright.options.LoadState.DOMCONTENTLOADED;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class TestHar extends TestBase {
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageBasic.java b/playwright/src/test/java/com/microsoft/playwright/TestPageBasic.java
index 4c76690c..9134cb3b 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageBasic.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageBasic.java
@@ -25,8 +25,8 @@ import java.util.List;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import static com.microsoft.playwright.LoadState.DOMCONTENTLOADED;
-import static com.microsoft.playwright.LoadState.LOAD;
+import static com.microsoft.playwright.options.LoadState.DOMCONTENTLOADED;
+import static com.microsoft.playwright.options.LoadState.LOAD;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class TestPageBasic extends TestBase {
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageEmulateMedia.java b/playwright/src/test/java/com/microsoft/playwright/TestPageEmulateMedia.java
index cbd62c25..e6075385 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageEmulateMedia.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageEmulateMedia.java
@@ -20,9 +20,9 @@ import org.junit.jupiter.api.Test;
 
 import java.util.function.Supplier;
 
-import static com.microsoft.playwright.ColorScheme.DARK;
-import static com.microsoft.playwright.ColorScheme.LIGHT;
-import static com.microsoft.playwright.Media.PRINT;
+import static com.microsoft.playwright.options.ColorScheme.DARK;
+import static com.microsoft.playwright.options.ColorScheme.LIGHT;
+import static com.microsoft.playwright.options.Media.PRINT;
 import static com.microsoft.playwright.Utils.attachFrame;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageExposeFunction.java b/playwright/src/test/java/com/microsoft/playwright/TestPageExposeFunction.java
index 9a65c3df..f7bd0211 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageExposeFunction.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageExposeFunction.java
@@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test;
 import java.util.Map;
 
 import static com.microsoft.playwright.Utils.mapOf;
-import static com.microsoft.playwright.WaitUntilState.LOAD;
+import static com.microsoft.playwright.options.WaitUntilState.LOAD;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageWaitForNavigation.java b/playwright/src/test/java/com/microsoft/playwright/TestPageWaitForNavigation.java
index eba5f6fd..2e625843 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageWaitForNavigation.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageWaitForNavigation.java
@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.WaitUntilState;
 import org.junit.jupiter.api.Test;
 
 import java.net.MalformedURLException;
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPopup.java b/playwright/src/test/java/com/microsoft/playwright/TestPopup.java
index b9cf0c14..0bd7e489 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPopup.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPopup.java
@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
-import static com.microsoft.playwright.LoadState.DOMCONTENTLOADED;
+import static com.microsoft.playwright.options.LoadState.DOMCONTENTLOADED;
 import static com.microsoft.playwright.Utils.mapOf;
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestTap.java b/playwright/src/test/java/com/microsoft/playwright/TestTap.java
index 9a1870f7..fe75cec9 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestTap.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestTap.java
@@ -24,7 +24,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.Semaphore;
 
-import static com.microsoft.playwright.KeyboardModifier.ALT;
+import static com.microsoft.playwright.options.KeyboardModifier.ALT;
 import static com.microsoft.playwright.Utils.mapOf;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
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
index b50516c6..1b073fad 100644
--- 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
@@ -925,6 +925,9 @@ class Interface extends TypeDefinition {
     if ("Playwright".equals(jsonName)) {
       output.add("import com.microsoft.playwright.impl.PlaywrightImpl;");
     }
+    if (asList("Page", "Frame", "ElementHandle", "Browser", "BrowserContext", "BrowserType", "Mouse", "Keyboard").contains(jsonName)) {
+      output.add("import com.microsoft.playwright.options.*;");
+    }
     if (jsonName.equals("Route")) {
       output.add("import java.nio.charset.StandardCharsets;");
     }
@@ -1265,9 +1268,10 @@ public class ApiGenerator {
         writer.write(text);
       }
     }
+    dir = new File(dir, "options");
     for (Enum e : enums.values()) {
       List<String> lines = new ArrayList<>();
-      lines.add(Interface.header);
+      lines.add(Interface.header.replace("package com.microsoft.playwright;", "package com.microsoft.playwright.options;"));
       e.writeTo(lines);
       String text = String.join("\n", lines);
       try (FileWriter writer = new FileWriter(new File(dir, e.jsonName + ".java"))) {