cleanup

Author: rbri

src/main/java/org/openqa/selenium/htmlunit/HtmlUnitAlert.java

@@ -43,11 +43,11 @@
  */
 public class HtmlUnitAlert implements Alert {
 
-    private HtmlUnitDriver driver_;
+    private final HtmlUnitDriver driver_;
     private AlertHolder holder_;
     private boolean quitting_;
-    private Lock lock_ = new ReentrantLock();
-    private Condition condition_ = lock_.newCondition();
+    private final Lock lock_ = new ReentrantLock();
+    private final Condition condition_ = lock_.newCondition();
     private WebWindow webWindow_;
     private UnexpectedAlertBehaviour unexpectedAlertBehaviour_ = UnexpectedAlertBehaviour.DISMISS_AND_NOTIFY;
 
@@ -229,7 +229,7 @@ public void ensureUnlocked() {
     }
 
     private static class AlertHolder {
-        private String message_;
+        private final String message_;
         private boolean accepted_;
 
         AlertHolder(final String message) {

src/main/java/org/openqa/selenium/htmlunit/HtmlUnitDriver.java

@@ -1090,7 +1090,6 @@ private static Object getPrivateField(final Object o, final String fieldName) {
 
     private static Map<String, Object> convertLocationToMap(final Location location) {
         final Map<String, Object> map = new HashMap<>();
-        map.put("href", location.getHref());
         map.put("protocol", location.getProtocol());
         map.put("host", location.getHost());
         map.put("hostname", location.getHostname());

src/main/java/org/openqa/selenium/htmlunit/HtmlUnitInputProcessor.java

@@ -79,7 +79,7 @@ public interface HtmlUnitAction {
     }
 
     private abstract static class DomElementHtmlUnitAction implements HtmlUnitAction {
-        private DomElement domElement_;
+        private final DomElement domElement_;
 
         DomElementHtmlUnitAction(final DomElement domElement) {
             domElement_ = domElement;

src/main/java/org/openqa/selenium/htmlunit/HtmlUnitWindow.java

@@ -35,7 +35,7 @@ public class HtmlUnitWindow implements WebDriver.Window {
 
     private final WebWindow webWindow_;
     private final Dimension initialWindowDimension_;
-    private Point windowPosition_ = getBasePoint();
+    private Point windowPosition_;
 
     public HtmlUnitWindow(final WebWindow webWindow) {
         webWindow_ = webWindow;

src/main/java/org/openqa/selenium/htmlunit/KeyboardModifiersState.java

@@ -30,7 +30,7 @@
  * @author Ronald Brill
  */
 class KeyboardModifiersState {
-    private Set<Character> set_ = new HashSet<>();
+    private final Set<Character> set_ = new HashSet<>();
     private boolean shiftPressed_;
     private boolean ctrlPressed_;
     private boolean altPressed_;

src/main/java/org/openqa/selenium/htmlunit/logging/HtmlUnitLogs.java

@@ -61,13 +61,13 @@ public LogEntries get(final String logType) {
      */
     @Override
     public Set<String> getAvailableLogTypes() {
-        return Collections.<String>emptySet();
+        return Collections.emptySet();
     }
 
     private static class HtmlUnitDriverLogger implements Logger {
         private static final int BUFFER_SIZE = 1000;
 
-        private LogEntry[] buffer_ = new LogEntry[BUFFER_SIZE];
+        private final LogEntry[] buffer_ = new LogEntry[BUFFER_SIZE];
         private int insertPos_ = 0;
         private boolean isFull_ = false;
 

src/test/java/org/openqa/selenium/htmlunit/WebDriverTestCase.java

@@ -201,7 +201,7 @@ public abstract class WebDriverTestCase extends WebTestCase {
     /**
      * All browsers supported.
      */
-    private static List<BrowserVersion> ALL_BROWSERS_ = Collections.unmodifiableList(
+    private static final List<BrowserVersion> ALL_BROWSERS_ = Collections.unmodifiableList(
             Arrays.asList(BrowserVersion.CHROME,
                     BrowserVersion.EDGE,
                     BrowserVersion.FIREFOX,
@@ -211,7 +211,7 @@ public abstract class WebDriverTestCase extends WebTestCase {
     /**
      * Browsers which run by default.
      */
-    private static BrowserVersion[] DEFAULT_RUNNING_BROWSERS_ =
+    private static final BrowserVersion[] DEFAULT_RUNNING_BROWSERS_ =
         {BrowserVersion.CHROME,
             BrowserVersion.EDGE,
             BrowserVersion.FIREFOX,
@@ -1076,8 +1076,8 @@ protected final WebDriver verifyTitle2(final WebDriver driver,
         }
         else {
             final StringBuilder expected = new StringBuilder();
-            for (int i = 0; i < expectedAlerts.length; i++) {
-                expected.append(expectedAlerts[i]).append('$');
+            for (final String expectedAlert : expectedAlerts) {
+                expected.append(expectedAlert).append('$');
             }
 
             final String title = driver.getTitle();
@@ -1128,8 +1128,8 @@ protected final WebDriver verifyTextArea2(final WebDriver driver,
         */
 
         final StringBuilder expected = new StringBuilder();
-        for (int i = 0; i < expectedAlerts.length; i++) {
-            expected.append(expectedAlerts[i]).append('$');
+        for (final String expectedAlert : expectedAlerts) {
+            expected.append(expectedAlert).append('$');
         }
         assertEquals(expected.toString(), textArea.getAttribute("value"));
 

src/test/java/org/openqa/selenium/htmlunit/html/WindowsTest.java

@@ -198,7 +198,7 @@ public void switchWindow() throws Exception {
 
         assertEquals("First", driver.getTitle());
 
-        windowHandles = new HashSet<String>(driver.getWindowHandles());
+        windowHandles = new HashSet<>(driver.getWindowHandles());
         assertEquals(2, windowHandles.size());
 
         windowHandles.remove(windowHandle);
@@ -227,7 +227,7 @@ public void switchToNewWindow() throws Exception {
 
         driver.switchTo().newWindow(WindowType.WINDOW);
 
-        windowHandles = new HashSet<String>(driver.getWindowHandles());
+        windowHandles = new HashSet<>(driver.getWindowHandles());
         assertEquals(2, windowHandles.size());
 
         assertEquals("", driver.getTitle());
@@ -254,7 +254,7 @@ public void switchToNewTab() throws Exception {
 
         driver.switchTo().newWindow(WindowType.TAB);
 
-        windowHandles = new HashSet<String>(driver.getWindowHandles());
+        windowHandles = new HashSet<>(driver.getWindowHandles());
         assertEquals(2, windowHandles.size());
 
         assertEquals("", driver.getTitle());

src/test/java/org/openqa/selenium/htmlunit/junit/BrowserStatement.java

@@ -36,7 +36,7 @@
  */
 class BrowserStatement extends Statement {
 
-    private Statement next_;
+    private final Statement next_;
     private final boolean notYetImplemented_;
     private final FrameworkMethod method_;
     private final boolean realBrowser_;

src/test/java/org/openqa/selenium/htmlunit/junit/StandardsFrameworkMethod.java

@@ -70,7 +70,7 @@ public boolean isShadowedBy(final FrameworkMethod other) {
 
     @Override
     public boolean equals(final Object obj) {
-        if (!FrameworkMethod.class.isInstance(obj)) {
+        if (!(obj instanceof FrameworkMethod)) {
             return false;
         }
         return ((FrameworkMethod) obj).getMethod().equals(getMethod())