use consts and util.objects

Author: Delta456

java/src/org/openqa/selenium/bidi/browsingcontext/DownloadCanceled.java

@@ -17,24 +17,28 @@
 
 package org.openqa.selenium.bidi.browsingcontext;
 
+import static java.util.Objects.requireNonNullElse;
+
 import org.openqa.selenium.json.JsonInput;
 
 public class DownloadCanceled extends NavigationInfo {
 
   private final String status;
 
+  private static final String CANCELED = "canceled";
+
   DownloadCanceled(
       String browsingContextId, String navigationId, long timestamp, String url, String status) {
     super(browsingContextId, navigationId, timestamp, url);
-    this.status = status != null ? status : "canceled";
+    this.status = requireNonNullElse(status, CANCELED);
   }
 
   public static DownloadCanceled fromJson(JsonInput input) {
     String browsingContextId = null;
     String navigationId = null;
     long timestamp = 0;
     String url = null;
-    String status = "canceled";
+    String status = CANCELED;
 
     input.beginObject();
     while (input.hasNext()) {
@@ -57,8 +61,9 @@ public static DownloadCanceled fromJson(JsonInput input) {
 
         case "status":
           status = input.read(String.class);
-          if (!"canceled".equals(status)) {
-            throw new IllegalArgumentException("Expected status 'canceled', but got: " + status);
+          if (!CANCELED.equals(status)) {
+            throw new IllegalArgumentException(
+                "Expected status '" + CANCELED + "' , but got: " + status);
           }
           break;
 

java/src/org/openqa/selenium/bidi/browsingcontext/DownloadCompleted.java

@@ -17,13 +17,17 @@
 
 package org.openqa.selenium.bidi.browsingcontext;
 
+import static java.util.Objects.requireNonNullElse;
+
 import org.openqa.selenium.json.JsonInput;
 
 public class DownloadCompleted extends NavigationInfo {
 
   private final String status;
   private final String filepath;
 
+  private static final String COMPLETE = "complete";
+
   DownloadCompleted(
       String browsingContextId,
       String navigationId,
@@ -32,7 +36,7 @@ public class DownloadCompleted extends NavigationInfo {
       String status,
       String filepath) {
     super(browsingContextId, navigationId, timestamp, url);
-    this.status = status != null ? status : "complete";
+    this.status = requireNonNullElse(status, COMPLETE);
     this.filepath = filepath;
   }
 
@@ -41,7 +45,7 @@ public static DownloadCompleted fromJson(JsonInput input) {
     String navigationId = null;
     long timestamp = 0;
     String url = null;
-    String status = "complete";
+    String status = COMPLETE;
     String filepath = null;
 
     input.beginObject();
@@ -65,8 +69,9 @@ public static DownloadCompleted fromJson(JsonInput input) {
 
         case "status":
           status = input.read(String.class);
-          if (!"complete".equals(status)) {
-            throw new IllegalArgumentException("Expected status 'complete', but got: " + status);
+          if (!COMPLETE.equals(status)) {
+            throw new IllegalArgumentException(
+                "Expected status '" + COMPLETE + "' , but got: " + status);
           }
           break;
 

java/src/org/openqa/selenium/bidi/browsingcontext/DownloadEnded.java

@@ -24,6 +24,9 @@
 
 public class DownloadEnded {
 
+  private static final String CANCELED = "canceled";
+  private static final String COMPLETE = "complete";
+
   private final NavigationInfo downloadParams;
 
   public DownloadEnded(NavigationInfo downloadParams) {
@@ -36,13 +39,13 @@ public static DownloadEnded fromJson(JsonInput input) {
 
     try (StringReader reader = new StringReader(new Json().toJson(jsonMap));
         JsonInput jsonInput = new Json().newInput(reader)) {
-      if ("canceled".equals(status)) {
+      if (CANCELED.equals(status)) {
         return new DownloadEnded(DownloadCanceled.fromJson(jsonInput));
-      } else if ("complete".equals(status)) {
+      } else if (COMPLETE.equals(status)) {
         return new DownloadEnded(DownloadCompleted.fromJson(jsonInput));
       } else {
         throw new IllegalArgumentException(
-            "status must be either 'canceled' or 'complete', but got: " + status);
+            "status must be either '" + CANCELED + "' or '" + COMPLETE + "', but got: " + status);
       }
     }
   }