cleanup

Author: rbri

src/main/java/org/htmlunit/HttpWebConnection.java

@@ -299,12 +299,11 @@ private HttpUriRequest makeHttpMethod(final WebRequest webRequest, final HttpCli
         // this has to be in sync with org.htmlunit.WebRequest.getRequestParameters()
 
         // POST, PUT, PATCH, DELETE, OPTIONS
-        if ((httpMethod instanceof HttpEntityEnclosingRequest)
-                && (httpMethod instanceof HttpPost
-                        || httpMethod instanceof HttpPut
-                        || httpMethod instanceof HttpPatch
-                        || httpMethod instanceof org.htmlunit.httpclient.HttpDelete
-                        || httpMethod instanceof org.htmlunit.httpclient.HttpOptions)) {
+        if (httpMethod instanceof HttpPost
+                || httpMethod instanceof HttpPut
+                || httpMethod instanceof HttpPatch
+                || httpMethod instanceof org.htmlunit.httpclient.HttpDelete
+                || httpMethod instanceof org.htmlunit.httpclient.HttpOptions) {
 
             final HttpEntityEnclosingRequest method = (HttpEntityEnclosingRequest) httpMethod;
 

src/main/java/org/htmlunit/attachment/AttachmentHandler.java

@@ -88,8 +88,7 @@ default boolean isAttachment(final WebResponse response) {
             // https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types#applicationoctet-stream
             // They treat it as if the Content-Disposition header was set to attachment, and propose a "Save As" dialog.
             final String contentType = response.getResponseHeaderValue(HttpHeader.CONTENT_TYPE);
-            return contentType != null
-                    && MimeType.APPLICATION_OCTET_STREAM.equalsIgnoreCase(contentType);
+            return MimeType.APPLICATION_OCTET_STREAM.equalsIgnoreCase(contentType);
         }
         return StringUtils.startsWithIgnoreCase(disp, "attachment");
     }

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

@@ -24,7 +24,6 @@
 import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -111,12 +110,8 @@ public class DomElement extends DomNamespaceNode implements Element {
     private String styleString_;
     private LinkedHashMap<String, StyleElement> styleMap_;
 
-    private static final Comparator<StyleElement> STYLE_ELEMENT_COMPARATOR = new Comparator<StyleElement>() {
-        @Override
-        public int compare(final StyleElement first, final StyleElement second) {
-            return StyleElement.compareToByImportanceAndSpecificity(first, second);
-        }
-    };
+    private static final Comparator<StyleElement> STYLE_ELEMENT_COMPARATOR =
+            (first, second) -> StyleElement.compareToByImportanceAndSpecificity(first, second);
 
     /**
      * Whether the Mouse is currently over this element or not.
@@ -625,7 +620,7 @@ public void writeStyleToElement(final Map<String, StyleElement> styleMap) {
 
         final StringBuilder builder = new StringBuilder();
         final List<StyleElement> styleElements = new ArrayList<>(styleMap.values());
-        Collections.sort(styleElements, STYLE_ELEMENT_COMPARATOR);
+        styleElements.sort(STYLE_ELEMENT_COMPARATOR);
         for (final StyleElement e : styleElements) {
             if (builder.length() != 0) {
                 builder.append(' ');

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

@@ -1528,7 +1528,7 @@ public void deregisterFramesIfNeeded() {
      */
     public List<FrameWindow> getFrames() {
         final List<BaseFrameElement> frameElements = new ArrayList<>(frameElements_);
-        Collections.sort(frameElements, DOCUMENT_POSITION_COMPERATOR);
+        frameElements.sort(DOCUMENT_POSITION_COMPERATOR);
 
         final List<FrameWindow> list = new ArrayList<>(frameElements.size());
         for (final BaseFrameElement frameElement : frameElements) {
@@ -2934,7 +2934,7 @@ DomElement first() {
                 return elements_.get(0);
             }
 
-            Collections.sort(elements_, DOCUMENT_POSITION_COMPERATOR);
+            elements_.sort(DOCUMENT_POSITION_COMPERATOR);
             sorted_ = true;
 
             return elements_.get(0);
@@ -2945,7 +2945,7 @@ List<DomElement> elements() {
                 return elements_;
             }
 
-            Collections.sort(elements_, DOCUMENT_POSITION_COMPERATOR);
+            elements_.sort(DOCUMENT_POSITION_COMPERATOR);
             sorted_ = true;
 
             return elements_;

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

@@ -44,8 +44,7 @@ public interface SelectableTextInput {
     void select();
 
     /**
-     * Returns all of the text in this element.
-     * @return all of the text in this element
+     * @return all the text in this element
      */
     String getText();
 

src/main/java/org/htmlunit/javascript/host/event/Event.java

@@ -186,15 +186,9 @@ public class Event extends HtmlUnitScriptable {
     /** The auxclick event type, triggered by {@code auxclick} event handlers. */
     public static final String TYPE_AUXCLICK = "auxclick";
 
-//    /** The mspointerleave event type, triggered by {@code mspointerleave} event handlers. */
-//    public static final String TYPE_MSPOINTERLEAVE = "mspointerleave";
-//
     /** The webkitanimationstart event type, triggered by {@code webkitanimationstart} event handlers. */
     public static final String TYPE_WEBANIMATIONSTART = "webkitanimationstart";
 
-//    /** The msgesturestart event type, triggered by {@code msgesturestart} event handlers. */
-//    public static final String TYPE_MSGESTURESTART = "msgesturestart";
-
     /** The drag event type, triggered by {@code drag} event handlers. */
     public static final String TYPE_DRAG = "drag";
 
@@ -255,9 +249,6 @@ public class Event extends HtmlUnitScriptable {
     /** The pageshow event type, triggered by {@code pageshow} event handlers. */
     public static final String TYPE_PAGESHOW = "pageshow";
 
-//    /** The mspointerenter event type, triggered by {@code mspointerenter} event handlers. */
-//    public static final String TYPE_MSPOINTENTER = "mspointerenter";
-
     /** The mozfullscreenchange event type, triggered by {@code mozfullscreenchange} event handlers. */
     public static final String TYPE_MOZFULLSCREENCHANGE = "mozfullscreenchange";
 
@@ -372,9 +363,6 @@ public class Event extends HtmlUnitScriptable {
     /** The transitionend event type, triggered by {@code transitionend} event handlers. */
     public static final String TYPE_TRANSITIONEND = "transitionend";
 
-//    /** The msgesturehold event type, triggered by {@code msgesturehold} event handlers. */
-//    public static final String TYPE_MSGESTUREHOLD = "msgesturehold";
-
     /** The deviceorientationabsolute event type, triggered by {@code deviceorientationabsolute} event handlers. */
     public static final String TYPE_DEVICEORIENTATIONABSOLUTE = "deviceorientationabsolute";
 
@@ -441,12 +429,6 @@ public class Event extends HtmlUnitScriptable {
     /** The ongamepaddisconnected event type, triggered by {@code ongamepaddisconnected} event handlers. */
     public static final String TYPE_GAMEPAD_DISCONNECTED = "ongamepaddisconnected";
 
-    /**
-     * The mssitemodejumplistitemremoved event type, triggered
-     * by {@code mssitemodejumplistitemremoved} event handlers.
-     */
-    public static final String TYPE_MSSITEMODEJUMPLISTITEMREMOVED = "mssitemodejumplistitemremoved";
-
     /** No event phase. */
     @JsxConstant
     public static final int NONE = 0;

src/main/java/org/htmlunit/javascript/host/worker/DedicatedWorkerGlobalScope.java

@@ -366,9 +366,8 @@ void loadAndExecute(final WebClient webClient, final String url,
         final AbstractJavaScriptEngine<?> javaScriptEngine = webClient.getJavaScriptEngine();
 
         final DedicatedWorkerGlobalScope thisScope = this;
-        final ContextAction<Object> action = cx -> {
-            return javaScriptEngine.execute(page, thisScope, scriptCode, fullUrl.toExternalForm(), 1);
-        };
+        final ContextAction<Object> action =
+                cx -> javaScriptEngine.execute(page, thisScope, scriptCode, fullUrl.toExternalForm(), 1);
 
         final HtmlUnitContextFactory cf = javaScriptEngine.getContextFactory();