From 68525d1426b133d1ee705756fe5d23c5bbddd0a5 Mon Sep 17 00:00:00 2001
From: JB Nizet <jb@ninja-squad.com>
Date: Fri, 29 Jan 2021 20:13:52 +0100
Subject: [PATCH] fix: avoid NPE when saving storage state (#235)

---
 .../playwright/impl/BrowserContextImpl.java         | 13 ++-----------
 .../playwright/TestBrowserContextStorageState.java  |  6 ++++--
 2 files changed, 6 insertions(+), 13 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 3fa402d9..93bf7f79 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java
@@ -21,9 +21,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.*;
 
-import java.io.FileWriter;
-import java.io.IOException;
-import java.nio.file.Files;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.function.Consumer;
@@ -320,14 +318,7 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
       JsonElement json = sendMessage("storageState");
       StorageState storageState = gson().fromJson(json, StorageState.class);
       if (options != null && options.path != null) {
-        try {
-          Files.createDirectories(options.path.getParent());
-          try (FileWriter writer = new FileWriter(options.path.toFile())) {
-            writer.write(json.toString());
-          }
-        } catch (IOException e) {
-          throw new PlaywrightException("Failed to write storage state to file", e);
-        }
+        Utils.writeToFile(json.toString().getBytes(StandardCharsets.UTF_8), options.path);
       }
       return storageState;
     });
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextStorageState.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextStorageState.java
index 32f30539..0b527337 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextStorageState.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextStorageState.java
@@ -21,8 +21,10 @@ import com.google.gson.JsonObject;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import java.io.FileReader;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Arrays;
 
@@ -112,7 +114,7 @@ public class TestBrowserContextStorageState extends TestBase {
       "        }]\n" +
       "    }]\n" +
       "}\n", JsonObject.class);
-    try (FileReader reader = new FileReader(path.toFile())) {
+    try (InputStreamReader reader = new InputStreamReader(new FileInputStream(path.toFile()), StandardCharsets.UTF_8)) {
       assertEquals(expected, new Gson().fromJson(reader, JsonObject.class));
     }
     BrowserContext context2 = browser.newContext(new Browser.NewContextOptions().withStorageState(path));