cleanup

Author: rbri

src/main/java/org/htmlunit/SgmlPage.java

@@ -269,7 +269,7 @@ public boolean isHtmlPage() {
      */
     @Override
     public DomNodeList<DomElement> getElementsByTagName(final String tagName) {
-        return new AbstractDomNodeList<DomElement>(this) {
+        return new AbstractDomNodeList<>(this) {
             @Override
             protected List<DomElement> provideElements() {
                 final List<DomElement> res = new ArrayList<>();
@@ -291,26 +291,25 @@ protected List<DomElement> provideElements() {
      */
     @Override
     public DomNodeList<DomElement> getElementsByTagNameNS(final String namespaceURI, final String localName) {
-        return new AbstractDomNodeList<DomElement>(this) {
+        return new AbstractDomNodeList<>(this) {
             @Override
             protected List<DomElement> provideElements() {
                 final List<DomElement> res = new ArrayList<>();
                 final Comparator<String> comparator;
 
                 if (hasCaseSensitiveTagNames()) {
                     comparator = Comparator.nullsFirst(String::compareTo);
-                }
-                else {
+                } else {
                     comparator = Comparator.nullsFirst(String::compareToIgnoreCase);
                 }
 
                 for (final DomElement elem : getDomElementDescendants()) {
                     final String locName = elem.getLocalName();
 
                     if ((StringUtils.equalsChar('*', namespaceURI)
-                                    || comparator.compare(namespaceURI, elem.getNamespaceURI()) == 0)
+                            || comparator.compare(namespaceURI, elem.getNamespaceURI()) == 0)
                             && (StringUtils.equalsChar('*', locName)
-                                    || comparator.compare(locName, elem.getLocalName()) == 0)) {
+                            || comparator.compare(locName, elem.getLocalName()) == 0)) {
                         res.add(elem);
                     }
                 }

src/main/java/org/htmlunit/WebClient.java

@@ -1423,7 +1423,7 @@ private WebResponse makeWebResponseForFileUrl(final WebRequest webRequest) throw
         }
 
         String fileUrl = cleanUrl.toExternalForm();
-        fileUrl = URLDecoder.decode(fileUrl, UTF_8.name());
+        fileUrl = URLDecoder.decode(fileUrl, UTF_8);
         final File file = new File(fileUrl.substring(5));
         if (!file.exists()) {
             // construct 404

src/main/java/org/htmlunit/html/DomElement.java

@@ -651,7 +651,7 @@ public DomNodeList<HtmlElement> getElementsByTagName(final String tagName) {
      * @return A list of matching elements.
      */
     <E extends HtmlElement> DomNodeList<E> getElementsByTagNameImpl(final String tagName) {
-        return new AbstractDomNodeList<E>(this) {
+        return new AbstractDomNodeList<>(this) {
             @Override
             @SuppressWarnings("unchecked")
             protected List<E> provideElements() {

src/main/java/org/htmlunit/html/HtmlPage.java

@@ -1607,13 +1607,12 @@ public HtmlElement tabToNextElement() {
                 // The element with focus isn't on this page
                 elementToGiveFocus = elements.get(0);
             }
+            else if (index == elements.size() - 1) {
+                // if at last jump to start
+                elementToGiveFocus = elements.get(0);
+            }
             else {
-                if (index == elements.size() - 1) {
-                    elementToGiveFocus = elements.get(0);
-                }
-                else {
-                    elementToGiveFocus = elements.get(index + 1);
-                }
+                elementToGiveFocus = elements.get(index + 1);
             }
         }
 
@@ -1645,13 +1644,12 @@ public HtmlElement tabToPreviousElement() {
                 // The element with focus isn't on this page
                 elementToGiveFocus = elements.get(elements.size() - 1);
             }
+            else if (index == 0) {
+                // first; back to the last
+                elementToGiveFocus = elements.get(elements.size() - 1);
+            }
             else {
-                if (index == 0) {
-                    elementToGiveFocus = elements.get(elements.size() - 1);
-                }
-                else {
-                    elementToGiveFocus = elements.get(index - 1);
-                }
+                elementToGiveFocus = elements.get(index - 1);
             }
         }
 
@@ -2894,8 +2892,7 @@ public synchronized void clear() {
             computedStyles_.clear();
         }
 
-        public synchronized Map<String, ComputedCssStyleDeclaration> remove(
-                final DomNode element) {
+        public synchronized Map<String, ComputedCssStyleDeclaration> remove(final DomNode element) {
             return computedStyles_.remove(element);
         }
 

src/main/java/org/htmlunit/html/impl/SimpleRange.java

@@ -549,7 +549,7 @@ private static int getMaxOffset(final DomNode node) {
     /**
      * @return a list with all nodes contained in this range
      */
-    public List<DomNode> containedNodes() {
+    public List containedNodes() {
         final DomNode ancestor = getCommonAncestorContainer();
         if (ancestor == null) {
             return Collections.EMPTY_LIST;

src/main/java/org/htmlunit/html/xpath/XPathHelper.java

@@ -40,7 +40,7 @@
  */
 public final class XPathHelper {
 
-    private static final ThreadLocal<Boolean> PROCESS_XPATH_ = new ThreadLocal<Boolean>() {
+    private static final ThreadLocal<Boolean> PROCESS_XPATH_ = new ThreadLocal<>() {
         @Override
         protected synchronized Boolean initialValue() {
             return Boolean.FALSE;

src/main/java/org/htmlunit/javascript/host/dom/Document.java

@@ -847,7 +847,7 @@ public HTMLElement getBody() {
             if (doc != null) {
                 for (final DomNode node : doc.getChildren()) {
                     if (node instanceof HtmlFrameSet) {
-                        return (HTMLElement) node.getScriptableObject();
+                        return node.getScriptableObject();
                     }
                 }
             }

src/main/java/org/htmlunit/javascript/host/html/HTMLTableElement.java

@@ -83,14 +83,13 @@ public HtmlUnitScriptable getCaption() {
      */
     @JsxSetter
     public void setCaption(final Object o) {
-        if (!(o instanceof HTMLTableCaptionElement)) {
+        if (!(o instanceof HTMLTableCaptionElement caption)) {
             throw JavaScriptEngine.typeError("Not a caption");
         }
 
         // remove old caption (if any)
         deleteCaption();
 
-        final HTMLTableCaptionElement caption = (HTMLTableCaptionElement) o;
         getDomNodeOrDie().appendChild(caption.getDomNodeOrDie());
     }
 
@@ -122,8 +121,7 @@ public void setTFoot(final Object o) {
         // remove old caption (if any)
         deleteTFoot();
 
-        final HTMLTableSectionElement tfoot = (HTMLTableSectionElement) o;
-        getDomNodeOrDie().appendChild(tfoot.getDomNodeOrDie());
+        getDomNodeOrDie().appendChild(element.getDomNodeOrDie());
     }
 
     /**
@@ -154,8 +152,7 @@ public void setTHead(final Object o) {
         // remove old caption (if any)
         deleteTHead();
 
-        final HTMLTableSectionElement thead = (HTMLTableSectionElement) o;
-        getDomNodeOrDie().appendChild(thead.getDomNodeOrDie());
+        getDomNodeOrDie().appendChild(element.getDomNodeOrDie());
     }
 
     /**

src/main/java/org/htmlunit/javascript/host/xml/XMLHttpRequest.java

@@ -771,7 +771,7 @@ public void send(final Object content) {
         else {
             // Create and start a thread in which to execute the request.
             final HtmlUnitContextFactory cf = client.getJavaScriptEngine().getContextFactory();
-            final ContextAction<Object> action = new ContextAction<Object>() {
+            final ContextAction<Object> action = new ContextAction<>() {
                 @Override
                 public Object run(final Context cx) {
                     doSend();

src/main/java/org/htmlunit/util/UrlUtils.java

@@ -1356,12 +1356,7 @@ public static String encodeQueryPart(final String part) {
             return "";
         }
 
-        try {
-            return URLEncoder.encode(part, "UTF-8");
-        }
-        catch (final UnsupportedEncodingException e) {
-            return part;
-        }
+        return URLEncoder.encode(part, UTF_8);
     }
 
     /**