chore: move junit impl to com.microsoft.playwright.impl.junit (#1538)

yury-s · web-flow · commit 90aa4579c4fe · 2024-04-03T15:31:20.000-07:00
diff --git a/playwright/pom.xml b/playwright/pom.xml
@@ -26,7 +26,7 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration combine.self="append">
           <subpackages>com.microsoft.playwright</subpackages>
-          <excludePackageNames>com.microsoft.playwright.impl,com.microsoft.playwright.junit.impl</excludePackageNames>
+          <excludePackageNames>com.microsoft.playwright.impl</excludePackageNames>
         </configuration>
       </plugin>
       <plugin>
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/APIRequestContextImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/APIRequestContextImpl.java
@@ -17,7 +17,6 @@
 package com.microsoft.playwright.impl;
 
 import com.google.gson.*;
-import com.google.gson.stream.JsonReader;
 import com.microsoft.playwright.APIRequestContext;
 import com.microsoft.playwright.APIResponse;
 import com.microsoft.playwright.PlaywrightException;
@@ -26,7 +25,6 @@
 import com.microsoft.playwright.options.RequestOptions;
 
 import java.io.File;
-import java.io.StringReader;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Base64;
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/junit/APIRequestContextExtension.java b/playwright/src/main/java/com/microsoft/playwright/impl/junit/APIRequestContextExtension.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright.junit.impl;
+package com.microsoft.playwright.impl.junit;
 
 import com.microsoft.playwright.APIRequest;
 import com.microsoft.playwright.APIRequestContext;
@@ -23,7 +23,7 @@
 import com.microsoft.playwright.junit.Options;
 import org.junit.jupiter.api.extension.*;
 
-import static com.microsoft.playwright.junit.impl.ExtensionUtils.isParameterSupported;
+import static com.microsoft.playwright.impl.junit.ExtensionUtils.isParameterSupported;
 
 public class APIRequestContextExtension implements ParameterResolver, BeforeEachCallback, AfterAllCallback {
   private static final ThreadLocal<APIRequestContext> threadLocalAPIRequestContext = new ThreadLocal<>();
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/junit/BrowserContextExtension.java b/playwright/src/main/java/com/microsoft/playwright/impl/junit/BrowserContextExtension.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright.junit.impl;
+package com.microsoft.playwright.impl.junit;
 
 import com.microsoft.playwright.Browser;
 import com.microsoft.playwright.BrowserContext;
@@ -24,7 +24,7 @@
 import com.microsoft.playwright.junit.Options;
 import org.junit.jupiter.api.extension.*;
 
-import static com.microsoft.playwright.junit.impl.ExtensionUtils.*;
+import static com.microsoft.playwright.impl.junit.ExtensionUtils.*;
 
 public class BrowserContextExtension implements ParameterResolver, AfterEachCallback {
   private static final ThreadLocal<BrowserContext> threadLocalBrowserContext = new ThreadLocal<>();
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/junit/BrowserExtension.java b/playwright/src/main/java/com/microsoft/playwright/impl/junit/BrowserExtension.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright.junit.impl;
+package com.microsoft.playwright.impl.junit;
 
 import com.microsoft.playwright.Browser;
 import com.microsoft.playwright.BrowserType;
@@ -24,7 +24,8 @@
 import com.microsoft.playwright.junit.Options;
 import org.junit.jupiter.api.extension.*;
 
-import static com.microsoft.playwright.junit.impl.ExtensionUtils.isParameterSupported;
+import static com.microsoft.playwright.impl.junit.ExtensionUtils.*;
+
 public class BrowserExtension implements ParameterResolver, AfterAllCallback {
   private static final ThreadLocal<Browser> threadLocalBrowser = new ThreadLocal<>();
 
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/junit/DefaultOptions.java b/playwright/src/main/java/com/microsoft/playwright/impl/junit/DefaultOptions.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright.junit.impl;
+package com.microsoft.playwright.impl.junit;
 
 import com.microsoft.playwright.junit.Options;
 import com.microsoft.playwright.junit.OptionsFactory;
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/junit/DeviceDescriptor.java b/playwright/src/main/java/com/microsoft/playwright/impl/junit/DeviceDescriptor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright.junit.impl;
+package com.microsoft.playwright.impl.junit;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/junit/ExtensionUtils.java b/playwright/src/main/java/com/microsoft/playwright/impl/junit/ExtensionUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright.junit.impl;
+package com.microsoft.playwright.impl.junit;
 
 import com.microsoft.playwright.Playwright;
 import com.microsoft.playwright.junit.Options;
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/junit/OptionsExtension.java b/playwright/src/main/java/com/microsoft/playwright/impl/junit/OptionsExtension.java
@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright.junit.impl;
+package com.microsoft.playwright.impl.junit;
 
 import com.microsoft.playwright.PlaywrightException;
 import com.microsoft.playwright.junit.Options;
-import com.microsoft.playwright.junit.OptionsFactory;
 import com.microsoft.playwright.junit.UsePlaywright;
 import org.junit.jupiter.api.extension.AfterAllCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
 
-import static com.microsoft.playwright.junit.impl.ExtensionUtils.getUsePlaywrightAnnotation;
+import static com.microsoft.playwright.impl.junit.ExtensionUtils.*;
 
 public class OptionsExtension implements AfterAllCallback {
   private static final ThreadLocal<Options> threadLocalOptions = new ThreadLocal<>();
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/junit/PageExtension.java b/playwright/src/main/java/com/microsoft/playwright/impl/junit/PageExtension.java
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright.junit.impl;
+package com.microsoft.playwright.impl.junit;
 
 import com.microsoft.playwright.BrowserContext;
 import com.microsoft.playwright.Page;
 import org.junit.jupiter.api.extension.*;
 
-import static com.microsoft.playwright.junit.impl.ExtensionUtils.isClassHook;
-import static com.microsoft.playwright.junit.impl.ExtensionUtils.isParameterSupported;
+import static com.microsoft.playwright.impl.junit.ExtensionUtils.*;
 
 public class PageExtension implements ParameterResolver, AfterEachCallback {
   private static final ThreadLocal<Page> threadLocalPage = new ThreadLocal<>();
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/junit/PlaywrightExtension.java b/playwright/src/main/java/com/microsoft/playwright/impl/junit/PlaywrightExtension.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.playwright.junit.impl;
+package com.microsoft.playwright.impl.junit;
 
 import com.microsoft.playwright.Playwright;
 import com.microsoft.playwright.junit.Options;
@@ -27,8 +27,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import static com.microsoft.playwright.junit.impl.ExtensionUtils.isParameterSupported;
-import static com.microsoft.playwright.junit.impl.ExtensionUtils.setTestIdAttribute;
+import static com.microsoft.playwright.impl.junit.ExtensionUtils.*;
 
 public class PlaywrightExtension implements ParameterResolver {
   private static final ThreadLocal<Playwright> threadLocalPlaywright = new ThreadLocal<>();
diff --git a/playwright/src/main/java/com/microsoft/playwright/junit/UsePlaywright.java b/playwright/src/main/java/com/microsoft/playwright/junit/UsePlaywright.java
@@ -16,7 +16,7 @@
 
 package com.microsoft.playwright.junit;
 
-import com.microsoft.playwright.junit.impl.*;
+import com.microsoft.playwright.impl.junit.*;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import java.lang.annotation.*;
