From 11163c437f46824c798dfd86787460f3bec6423e Mon Sep 17 00:00:00 2001
From: Andrei Solntsev <andrei.solntsev@gmail.com>
Date: Sat, 2 Nov 2024 16:58:36 +0200
Subject: [PATCH 1/6] fix warning "Call to 'toArray()' with pre-sized array
 argument 'new String[normalized.size()]'"

---
 .../css/parser/property/PrimitivePropertyBuilders.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flying-saucer-core/src/main/java/org/xhtmlrenderer/css/parser/property/PrimitivePropertyBuilders.java b/flying-saucer-core/src/main/java/org/xhtmlrenderer/css/parser/property/PrimitivePropertyBuilders.java
index 3c8093c1f..d84c9ca1c 100644
--- a/flying-saucer-core/src/main/java/org/xhtmlrenderer/css/parser/property/PrimitivePropertyBuilders.java
+++ b/flying-saucer-core/src/main/java/org/xhtmlrenderer/css/parser/property/PrimitivePropertyBuilders.java
@@ -962,7 +962,7 @@ public List<PropertyDeclaration> buildDeclarations(
 
             String text = concat(normalized, ',');
             PropertyValue result = new PropertyValue(
-                    CSSPrimitiveValue.CSS_STRING, text, text, normalized.toArray(new String[normalized.size()]), null);  // HACK cssText can be wrong
+                    CSSPrimitiveValue.CSS_STRING, text, text, normalized.toArray(new String[0]), null);  // HACK cssText can be wrong
 
             return singletonList(
                     new PropertyDeclaration(cssName, result, important, origin));

From 7d924daba767998990bb8ad357b94f61e7f88cbd Mon Sep 17 00:00:00 2001
From: Andrei Solntsev <andrei.solntsev@gmail.com>
Date: Sat, 2 Nov 2024 17:00:13 +0200
Subject: [PATCH 2/6] fix warning "Instantiating object to get Class object"

---
 .../java/org/xhtmlrenderer/demo/browser/BrowserPanel.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/flying-saucer-examples/src/main/java/org/xhtmlrenderer/demo/browser/BrowserPanel.java b/flying-saucer-examples/src/main/java/org/xhtmlrenderer/demo/browser/BrowserPanel.java
index 0f652f1a7..bb8bd53fc 100755
--- a/flying-saucer-examples/src/main/java/org/xhtmlrenderer/demo/browser/BrowserPanel.java
+++ b/flying-saucer-examples/src/main/java/org/xhtmlrenderer/demo/browser/BrowserPanel.java
@@ -52,6 +52,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import static java.util.Objects.requireNonNull;
+
 public final class BrowserPanel extends JPanel implements DocumentListener {
     private static final org.slf4j.Logger log = LoggerFactory.getLogger(BrowserPanel.class);
     private static final Logger logger = Logger.getLogger("app.browser");
@@ -145,7 +147,7 @@ private void loadCustomFonts() {
         SharedContext rc = view.getSharedContext();
         try {
             rc.setFontMapping("Fuzz", Font.createFont(Font.TRUETYPE_FONT,
-                    new DemoMarker().getClass().getResourceAsStream("/demos/fonts/fuzz.ttf")));
+                    requireNonNull(DemoMarker.class.getResourceAsStream("/demos/fonts/fuzz.ttf"))));
         } catch (Exception ex) {
             Uu.p(ex);
         }

From a0c69d4af714b9a62264110769f4e162b2697625 Mon Sep 17 00:00:00 2001
From: Andrei Solntsev <andrei.solntsev@gmail.com>
Date: Sat, 2 Nov 2024 17:04:12 +0200
Subject: [PATCH 3/6] disable warning "Optional.get() is called without
 isPresent() check" in tests

---
 .idea/inspectionProfiles/Project_Default.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index a209b6ae6..0aeb6c70e 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -44,6 +44,9 @@
       <option name="loggerClassName" value="java.util.logging.Logger,org.slf4j.Logger,org.apache.commons.logging.Log,org.apache.log4j.Logger,org.apache.logging.log4j.Logger" />
     </inspection_tool>
     <inspection_tool class="NullThrown" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="OptionalGetWithoutIsPresent" enabled="true" level="WARNING" enabled_by_default="true">
+      <scope name="Tests" level="WARNING" enabled="false" />
+    </inspection_tool>
     <inspection_tool class="PackageDotHtmlMayBePackageInfo" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="RandomDoubleForRandomInteger" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="SameParameterValue" enabled="true" level="WARNING" enabled_by_default="true">

From f3c62e358e4bb63e239e2624831dd5721fafe4c1 Mon Sep 17 00:00:00 2001
From: Andrei Solntsev <andrei.solntsev@gmail.com>
Date: Sat, 2 Nov 2024 17:08:05 +0200
Subject: [PATCH 4/6] fix @Nullable on array

---
 .../java/org/xhtmlrenderer/css/parser/CSSParseException.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/flying-saucer-core/src/main/java/org/xhtmlrenderer/css/parser/CSSParseException.java b/flying-saucer-core/src/main/java/org/xhtmlrenderer/css/parser/CSSParseException.java
index 25c379dec..08573a7e0 100644
--- a/flying-saucer-core/src/main/java/org/xhtmlrenderer/css/parser/CSSParseException.java
+++ b/flying-saucer-core/src/main/java/org/xhtmlrenderer/css/parser/CSSParseException.java
@@ -24,8 +24,7 @@
 public class CSSParseException extends RuntimeException {
     @Nullable
     private final Token _found;
-    @Nullable
-    private final Token[] _expected;
+    private final Token @Nullable [] _expected;
     private int _line;
 
     @Nullable
@@ -52,7 +51,7 @@ public CSSParseException(Token found, Token expected, int line) {
         _genericMessage = null;
     }
 
-    public CSSParseException(Token found, @Nullable Token[] expected, int line) {
+    public CSSParseException(Token found, Token @Nullable [] expected, int line) {
         _found = found;
         _expected = expected == null ? new Token[]{} : expected.clone();
         _line = line;

From 027722c035320ba27ddf3383d7155a7ee5018b50 Mon Sep 17 00:00:00 2001
From: Andrei Solntsev <andrei.solntsev@gmail.com>
Date: Sat, 2 Nov 2024 17:09:18 +0200
Subject: [PATCH 5/6] fix warning "Condition 'position >= 0' covered by
 subsequent condition 'position % 2 == 1'"

---
 .../main/java/org/xhtmlrenderer/css/extend/TreeResolver.java    | 2 ++
 .../src/main/java/org/xhtmlrenderer/css/newmatch/Condition.java | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/flying-saucer-core/src/main/java/org/xhtmlrenderer/css/extend/TreeResolver.java b/flying-saucer-core/src/main/java/org/xhtmlrenderer/css/extend/TreeResolver.java
index 1811620d3..a0219caf3 100644
--- a/flying-saucer-core/src/main/java/org/xhtmlrenderer/css/extend/TreeResolver.java
+++ b/flying-saucer-core/src/main/java/org/xhtmlrenderer/css/extend/TreeResolver.java
@@ -19,6 +19,7 @@
  */
 package org.xhtmlrenderer.css.extend;
 
+import com.google.errorprone.annotations.CheckReturnValue;
 import org.w3c.dom.Node;
 
 /**
@@ -62,6 +63,7 @@ public interface TreeResolver {
      * @param element The node
      * @return -1 in case of error, 0 indexed position otherwise
      */
+    @CheckReturnValue
     int getPositionOfElement(Node element);
 
     /**
diff --git a/flying-saucer-core/src/main/java/org/xhtmlrenderer/css/newmatch/Condition.java b/flying-saucer-core/src/main/java/org/xhtmlrenderer/css/newmatch/Condition.java
index 1d76347fb..586025bc1 100644
--- a/flying-saucer-core/src/main/java/org/xhtmlrenderer/css/newmatch/Condition.java
+++ b/flying-saucer-core/src/main/java/org/xhtmlrenderer/css/newmatch/Condition.java
@@ -476,7 +476,7 @@ private static class OddChildCondition extends Condition {
         @Override
         boolean matches(Node e, AttributeResolver attRes, TreeResolver treeRes) {
             int position = treeRes.getPositionOfElement(e);
-            return position >= 0 && position % 2 == 1;
+            return position % 2 == 1;
         }
     }
 

From e4d3074e7f779fa65a14ff4116cb2ea9184d4302 Mon Sep 17 00:00:00 2001
From: Andrei Solntsev <andrei.solntsev@gmail.com>
Date: Sat, 2 Nov 2024 17:13:15 +0200
Subject: [PATCH 6/6] fix warning "Duplicate branches in 'switch'"

---
 .../src/main/java/org/xhtmlrenderer/swt/SWTOutputDevice.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/SWTOutputDevice.java b/flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/SWTOutputDevice.java
index d4fd0da4c..79fe6d98b 100644
--- a/flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/SWTOutputDevice.java
+++ b/flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/SWTOutputDevice.java
@@ -299,7 +299,7 @@ public void setStroke(Stroke s) {
             case BasicStroke.CAP_BUTT -> SWT.CAP_FLAT;
             case BasicStroke.CAP_ROUND -> SWT.CAP_ROUND;
             case BasicStroke.CAP_SQUARE -> SWT.CAP_SQUARE;
-            default -> SWT.CAP_SQUARE;
+            default -> throw new IllegalArgumentException("Unsupported CAP value: " + bs.getEndCap());
         };
         _gc.setLineCap(gcCap);
 
@@ -308,7 +308,7 @@ public void setStroke(Stroke s) {
             case BasicStroke.JOIN_BEVEL -> SWT.JOIN_BEVEL;
             case BasicStroke.JOIN_MITER -> SWT.JOIN_MITER;
             case BasicStroke.JOIN_ROUND -> SWT.JOIN_ROUND;
-            default -> SWT.JOIN_MITER;
+            default -> throw new IllegalArgumentException("Unsupported line join: " + bs.getLineJoin());
         };
         _gc.setLineJoin(gcJoin);