Fix SpotBugs warnings for lazy init and null checks (#4412)

shai-almog · web-flow · commit ab2f392cd92f · 2026-01-13T21:08:17.000+02:00
diff --git a/.github/scripts/generate-quality-report.py b/.github/scripts/generate-quality-report.py
@@ -818,12 +818,15 @@ def main() -> None:
             "NP_BOOLEAN_RETURN_NULL",
             "REFLC_REFLECTION_MAY_INCREASE_ACCESSIBILITY_OF_CLASS",
             "REC_CATCH_EXCEPTION",
+            "RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE",
+            "RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT",
             "UI_INHERITANCE_UNSAFE_GETRESOURCE",
             "URF_UNREAD_FIELD",
             "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD",
             "UUF_UNUSED_FIELD",
             "UWF_NULL_FIELD",
             "UW_UNCOND_WAIT",
+            "LI_LAZY_INIT_UPDATE_STATIC",
             "SIC_INNER_SHOULD_BE_STATIC_ANON",
             "SS_SHOULD_BE_STATIC",
             "UPM_UNCALLED_PRIVATE_METHOD",
diff --git a/CodenameOne/src/com/codename1/charts/ChartComponent.java b/CodenameOne/src/com/codename1/charts/ChartComponent.java
@@ -679,7 +679,7 @@ public void pointerDragged(int[] x, int[] y) {
      */
     public boolean isPanEnabled() {
         if (chart instanceof XYChart) {
-            ((XYChart) chart).getRenderer().isPanEnabled();
+            return ((XYChart) chart).getRenderer().isPanEnabled();
         }
         return panEnabled;
     }
@@ -767,7 +767,7 @@ public void clearPanLimits() {
      */
     public boolean isZoomEnabled() {
         if (chart instanceof XYChart) {
-            ((XYChart) chart).getRenderer().isZoomEnabled();
+            return ((XYChart) chart).getRenderer().isZoomEnabled();
         }
         return zoomEnabled;
     }
diff --git a/CodenameOne/src/com/codename1/impl/CodenameOneImplementation.java b/CodenameOne/src/com/codename1/impl/CodenameOneImplementation.java
@@ -3966,7 +3966,10 @@ public Rectangle getDisplaySafeArea(Rectangle rect) {
      *                        common constants in this class or be a user/implementation defined sound
      */
     public void playBuiltinSound(String soundIdentifier) {
-        playUserSound(soundIdentifier);
+        boolean played = playUserSound(soundIdentifier);
+        if (!played) {
+            return;
+        }
     }
 
     /**
diff --git a/CodenameOne/src/com/codename1/io/WebServiceProxyCall.java b/CodenameOne/src/com/codename1/io/WebServiceProxyCall.java
@@ -563,11 +563,14 @@ protected void readResponse(InputStream input) throws IOException {
         @Override
         protected void buildRequestBody(OutputStream os) throws IOException {
             DataOutputStream dos = new DataOutputStream(os);
-            dos.writeUTF(def.name);
+            WSDefinition localDef = def;
+            dos.writeUTF(localDef.name);
+            if (localDef.arguments == null) {
+                return;
+            }
             int alen = arguments.length;
             for (int iter = 0; iter < alen; iter++) {
-                if (def == null || def.arguments == null) continue;
-                switch (def.arguments[iter]) {
+                switch (localDef.arguments[iter]) {
                     case TYPE_BYTE:
                         dos.writeByte(((Byte) arguments[iter]).byteValue());
                         break;
diff --git a/CodenameOne/src/com/codename1/maps/MapComponent.java b/CodenameOne/src/com/codename1/maps/MapComponent.java
@@ -488,9 +488,9 @@ public void run() {
         y = y - getAbsoluteY();
         Tile t = screenTile();
         Coord southWest = t.position(x - 20, t.dimension().getHeight() - y - 20);
-        Mercator.inverseMercator(southWest.getLatitude(), southWest.getLongitude());
+        southWest = Mercator.inverseMercator(southWest.getLatitude(), southWest.getLongitude());
         Coord northEast = t.position(x + 20, t.dimension().getHeight() - y + 20);
-        Mercator.inverseMercator(northEast.getLatitude(), northEast.getLongitude());
+        northEast = Mercator.inverseMercator(northEast.getLatitude(), northEast.getLongitude());
 
         BoundingBox bbox = new BoundingBox(southWest, northEast);
         Enumeration e = _layers.elements();
diff --git a/CodenameOne/src/com/codename1/ui/TextField.java b/CodenameOne/src/com/codename1/ui/TextField.java
@@ -297,7 +297,13 @@ public static TextArea create(String text) {
     }
 
     private static void initInputModes() {
-        if (inputModes == null) {
+        if (inputModes != null) {
+            return;
+        }
+        synchronized (TextField.class) {
+            if (inputModes != null) {
+                return;
+            }
             firstUppercaseInputMode.addElement("Abc");
             inputModes = new Hashtable();
             Hashtable upcase = new Hashtable();
diff --git a/CodenameOne/src/com/codename1/ui/Transform.java b/CodenameOne/src/com/codename1/ui/Transform.java
@@ -83,9 +83,14 @@ private Transform(Object nativeTransform) {
     }
 
     public static Transform IDENTITY() {
-        if (_IDENTITY == null) {
-            _IDENTITY = new ImmutableTransform(Display.impl.makeTransformIdentity());
-            _IDENTITY.type = TYPE_IDENTITY;
+        if (_IDENTITY != null) {
+            return _IDENTITY;
+        }
+        synchronized (Transform.class) {
+            if (_IDENTITY == null) {
+                _IDENTITY = new ImmutableTransform(Display.impl.makeTransformIdentity());
+                _IDENTITY.type = TYPE_IDENTITY;
+            }
         }
         return _IDENTITY;
     }
diff --git a/CodenameOne/src/com/codename1/ui/animations/CommonTransitions.java b/CodenameOne/src/com/codename1/ui/animations/CommonTransitions.java
@@ -499,13 +499,18 @@ public void initTransition() {
 
         if (transitionType == TYPE_TIMELINE) {
             hideInterformContainers();
-            Graphics g = buffer.getGraphics();
+            Image timelineBuffer = buffer;
+            if (timelineBuffer == null) {
+                timelineBuffer = createMutableImage(w, h);
+                buffer = timelineBuffer;
+            }
+            Graphics g = timelineBuffer.getGraphics();
             g.translate(-source.getAbsoluteX(), -source.getAbsoluteY());
 
-            g.setClip(0, 0, buffer.getWidth() + source.getAbsoluteX(), buffer.getHeight() + source.getAbsoluteY());
+            g.setClip(0, 0, timelineBuffer.getWidth() + source.getAbsoluteX(), timelineBuffer.getHeight() + source.getAbsoluteY());
 
-            if (timeline != null && buffer != null && (timeline.getWidth() != buffer.getWidth() || timeline.getHeight() != buffer.getHeight())) {
-                timeline = timeline.scaled(buffer.getWidth(), buffer.getHeight());
+            if (timeline != null && (timeline.getWidth() != timelineBuffer.getWidth() || timeline.getHeight() != timelineBuffer.getHeight())) {
+                timeline = timeline.scaled(timelineBuffer.getWidth(), timelineBuffer.getHeight());
             }
 
             if (timeline instanceof Timeline) {
@@ -876,10 +881,13 @@ private void paintShiftFadeHierarchy(Container c, int alpha, Graphics g, boolean
     }
 
     private Motion getComponentShiftMotion(Component c, boolean incoming) {
+        if (c == null) {
+            return null;
+        }
         Motion m = (Motion) c.getClientProperty("$shm");
         if (m == null) {
             Component dest = getDestination();
-            if (dest == null || c == null) {
+            if (dest == null) {
                 return m;
             }
             int travelDestination = dest.getWidth() - c.getWidth() - c.getAbsoluteX();
diff --git a/CodenameOne/src/com/codename1/ui/plaf/CSSBorder.java b/CodenameOne/src/com/codename1/ui/plaf/CSSBorder.java
@@ -318,13 +318,18 @@ private static boolean isTransparent(Color color) {
     }
 
     private static Map<String, Byte> styleMap() {
-        if (styleMap == null) {
-            styleMap = new HashMap<String, Byte>();
-            styleMap.put("none", STYLE_NONE);
-            styleMap.put("hidden", STYLE_HIDDEN);
-            styleMap.put("dotted", STYLE_DOTTED);
-            styleMap.put("dashed", STYLE_DASHED);
-            styleMap.put("solid", STYLE_SOLID);
+        if (styleMap != null) {
+            return styleMap;
+        }
+        synchronized (CSSBorder.class) {
+            if (styleMap == null) {
+                styleMap = new HashMap<String, Byte>();
+                styleMap.put("none", STYLE_NONE);
+                styleMap.put("hidden", STYLE_HIDDEN);
+                styleMap.put("dotted", STYLE_DOTTED);
+                styleMap.put("dashed", STYLE_DASHED);
+                styleMap.put("solid", STYLE_SOLID);
+            }
         }
         return styleMap;
     }
diff --git a/CodenameOne/src/com/codename1/ui/plaf/StyleParser.java b/CodenameOne/src/com/codename1/ui/plaf/StyleParser.java
@@ -807,40 +807,44 @@ static Image parseBgImage(Resources theme, String val) {
     }
 
     private static Map<String, Integer> bgTypes() {
-        if (bgTypes == null) {
-            bgTypes = new HashMap<String, Integer>();
-            Object[] types = new Object[]{
-                    "image_aligned_bottom", (int) Style.BACKGROUND_IMAGE_ALIGNED_BOTTOM,
-                    "image_aligned_top", (int) Style.BACKGROUND_IMAGE_ALIGNED_TOP,
-                    "image_aligned_bottom_right", (int) Style.BACKGROUND_IMAGE_ALIGNED_BOTTOM_RIGHT,
-                    "image_aligned_bottom_left", (int) Style.BACKGROUND_IMAGE_ALIGNED_BOTTOM_LEFT,
-                    "image_aligned_top_right", (int) Style.BACKGROUND_IMAGE_ALIGNED_TOP_RIGHT,
-                    "image_aligned_top_left", (int) Style.BACKGROUND_IMAGE_ALIGNED_TOP_LEFT,
-                    "image_aligned_left", (int) Style.BACKGROUND_IMAGE_ALIGNED_LEFT,
-                    "image_aligned_right", (int) Style.BACKGROUND_IMAGE_ALIGNED_RIGHT,
-                    "image_aligned_center", (int) Style.BACKGROUND_IMAGE_ALIGNED_CENTER,
-                    "image_scaled", (int) Style.BACKGROUND_IMAGE_SCALED,
-                    "image_scaled_fill", (int) Style.BACKGROUND_IMAGE_SCALED_FILL,
-                    "image_scaled_fit", (int) Style.BACKGROUND_IMAGE_SCALED_FIT,
-                    "image_tile_both", (int) Style.BACKGROUND_IMAGE_TILE_BOTH,
-                    "image_tile_horizontal", (int) Style.BACKGROUND_IMAGE_TILE_HORIZONTAL,
-                    "image_tile_vertical", (int) Style.BACKGROUND_IMAGE_TILE_VERTICAL,
-                    "image_tile_horizontal_align_bottom", (int) Style.BACKGROUND_IMAGE_TILE_HORIZONTAL_ALIGN_BOTTOM,
-                    "image_tile_horizontal_align_top", (int) Style.BACKGROUND_IMAGE_TILE_HORIZONTAL_ALIGN_TOP,
-                    "image_tile_horizontal_align_center", (int) Style.BACKGROUND_IMAGE_TILE_HORIZONTAL_ALIGN_CENTER,
-                    "image_tile_vertical_align_left", (int) Style.BACKGROUND_IMAGE_TILE_VERTICAL_ALIGN_LEFT,
-                    "image_tile_vertical_align_right", (int) Style.BACKGROUND_IMAGE_TILE_VERTICAL_ALIGN_RIGHT,
-                    "image_tile_vertical_align_center", (int) Style.BACKGROUND_IMAGE_TILE_VERTICAL_ALIGN_CENTER,
-                    "gradient_radial", (int) Style.BACKGROUND_GRADIENT_RADIAL,
-                    "gradient_linear_horizontal", (int) Style.BACKGROUND_GRADIENT_LINEAR_HORIZONTAL,
-                    "gradient_linear_vertical", (int) Style.BACKGROUND_GRADIENT_LINEAR_VERTICAL,
-                    "none", (int) Style.BACKGROUND_NONE
-            };
-            int len = types.length;
-            for (int i = 0; i < len; i += 2) {
-                bgTypes.put((String) types[i], (Integer) types[i + 1]);
+        if (bgTypes != null) {
+            return bgTypes;
+        }
+        synchronized (StyleParser.class) {
+            if (bgTypes == null) {
+                bgTypes = new HashMap<String, Integer>();
+                Object[] types = new Object[]{
+                        "image_aligned_bottom", (int) Style.BACKGROUND_IMAGE_ALIGNED_BOTTOM,
+                        "image_aligned_top", (int) Style.BACKGROUND_IMAGE_ALIGNED_TOP,
+                        "image_aligned_bottom_right", (int) Style.BACKGROUND_IMAGE_ALIGNED_BOTTOM_RIGHT,
+                        "image_aligned_bottom_left", (int) Style.BACKGROUND_IMAGE_ALIGNED_BOTTOM_LEFT,
+                        "image_aligned_top_right", (int) Style.BACKGROUND_IMAGE_ALIGNED_TOP_RIGHT,
+                        "image_aligned_top_left", (int) Style.BACKGROUND_IMAGE_ALIGNED_TOP_LEFT,
+                        "image_aligned_left", (int) Style.BACKGROUND_IMAGE_ALIGNED_LEFT,
+                        "image_aligned_right", (int) Style.BACKGROUND_IMAGE_ALIGNED_RIGHT,
+                        "image_aligned_center", (int) Style.BACKGROUND_IMAGE_ALIGNED_CENTER,
+                        "image_scaled", (int) Style.BACKGROUND_IMAGE_SCALED,
+                        "image_scaled_fill", (int) Style.BACKGROUND_IMAGE_SCALED_FILL,
+                        "image_scaled_fit", (int) Style.BACKGROUND_IMAGE_SCALED_FIT,
+                        "image_tile_both", (int) Style.BACKGROUND_IMAGE_TILE_BOTH,
+                        "image_tile_horizontal", (int) Style.BACKGROUND_IMAGE_TILE_HORIZONTAL,
+                        "image_tile_vertical", (int) Style.BACKGROUND_IMAGE_TILE_VERTICAL,
+                        "image_tile_horizontal_align_bottom", (int) Style.BACKGROUND_IMAGE_TILE_HORIZONTAL_ALIGN_BOTTOM,
+                        "image_tile_horizontal_align_top", (int) Style.BACKGROUND_IMAGE_TILE_HORIZONTAL_ALIGN_TOP,
+                        "image_tile_horizontal_align_center", (int) Style.BACKGROUND_IMAGE_TILE_HORIZONTAL_ALIGN_CENTER,
+                        "image_tile_vertical_align_left", (int) Style.BACKGROUND_IMAGE_TILE_VERTICAL_ALIGN_LEFT,
+                        "image_tile_vertical_align_right", (int) Style.BACKGROUND_IMAGE_TILE_VERTICAL_ALIGN_RIGHT,
+                        "image_tile_vertical_align_center", (int) Style.BACKGROUND_IMAGE_TILE_VERTICAL_ALIGN_CENTER,
+                        "gradient_radial", (int) Style.BACKGROUND_GRADIENT_RADIAL,
+                        "gradient_linear_horizontal", (int) Style.BACKGROUND_GRADIENT_LINEAR_HORIZONTAL,
+                        "gradient_linear_vertical", (int) Style.BACKGROUND_GRADIENT_LINEAR_VERTICAL,
+                        "none", (int) Style.BACKGROUND_NONE
+                };
+                int len = types.length;
+                for (int i = 0; i < len; i += 2) {
+                    bgTypes.put((String) types[i], (Integer) types[i + 1]);
+                }
             }
-
         }
         return bgTypes;
     }
diff --git a/CodenameOne/src/com/codename1/ui/validation/Validator.java b/CodenameOne/src/com/codename1/ui/validation/Validator.java
@@ -126,11 +126,20 @@ public class Validator {
      * Default constructor
      */
     public Validator() {
-        if (defaultValidationFailedEmblem == null) {
-            // initialize the default emblem
-            defaultValidationFailedEmblem = FontImage.createMaterial(FontImage.MATERIAL_CANCEL, "InvalidEmblem", 3);
-            validationFailedEmblem = defaultValidationFailedEmblem;
+        validationFailedEmblem = initDefaultValidationFailedEmblem();
+    }
+
+    private static Image initDefaultValidationFailedEmblem() {
+        if (defaultValidationFailedEmblem != null) {
+            return defaultValidationFailedEmblem;
+        }
+        synchronized (Validator.class) {
+            if (defaultValidationFailedEmblem == null) {
+                // initialize the default emblem
+                defaultValidationFailedEmblem = FontImage.createMaterial(FontImage.MATERIAL_CANCEL, "InvalidEmblem", 3);
+            }
         }
+        return defaultValidationFailedEmblem;
     }
 
     /**
@@ -549,10 +558,9 @@ public void scrollChanged(int scrollX, int scrollY, int oldscrollX, int oldscrol
                                     float height = cmp.getHeight();
                                     xpos += Math.round(width * validationEmblemPositionX);
                                     ypos += Math.round(height * validationEmblemPositionY);
-                                    if (message != null) {
-                                        message.showPopupDialog(new Rectangle(xpos, ypos, validationFailedEmblem.getWidth(),
-                                                validationFailedEmblem.getHeight()));
-                                    }
+                                    InteractionDialog dialog = message;
+                                    dialog.showPopupDialog(new Rectangle(xpos, ypos, validationFailedEmblem.getWidth(),
+                                            validationFailedEmblem.getHeight()));
                                 } else {
                                     message.showPopupDialog(cmp);
                                 }

Original file line number	Diff line number	Diff line change
`@@ -679,7 +679,7 @@ public void pointerDragged(int[] x, int[] y) {`
`679`	`679`	`*/`
`680`	`680`	`public boolean isPanEnabled() {`
`681`	`681`	`if (chart instanceof XYChart) {`
`682`		`- ((XYChart) chart).getRenderer().isPanEnabled();`
	`682`	`+ return ((XYChart) chart).getRenderer().isPanEnabled();`
`683`	`683`	`}`
`684`	`684`	`return panEnabled;`
`685`	`685`	`}`
`@@ -767,7 +767,7 @@ public void clearPanLimits() {`
`767`	`767`	`*/`
`768`	`768`	`public boolean isZoomEnabled() {`
`769`	`769`	`if (chart instanceof XYChart) {`
`770`		`- ((XYChart) chart).getRenderer().isZoomEnabled();`
	`770`	`+ return ((XYChart) chart).getRenderer().isZoomEnabled();`
`771`	`771`	`}`
`772`	`772`	`return zoomEnabled;`
`773`	`773`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,9 +83,14 @@ private Transform(Object nativeTransform) {`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`public static Transform IDENTITY() {`
`86`		`- if (_IDENTITY == null) {`
`87`		`- _IDENTITY = new ImmutableTransform(Display.impl.makeTransformIdentity());`
`88`		`- _IDENTITY.type = TYPE_IDENTITY;`
	`86`	`+ if (_IDENTITY != null) {`
	`87`	`+ return _IDENTITY;`
	`88`	`+ }`
	`89`	`+ synchronized (Transform.class) {`
	`90`	`+ if (_IDENTITY == null) {`
	`91`	`+ _IDENTITY = new ImmutableTransform(Display.impl.makeTransformIdentity());`
	`92`	`+ _IDENTITY.type = TYPE_IDENTITY;`
	`93`	`+ }`
`89`	`94`	`}`
`90`	`95`	`return _IDENTITY;`
`91`	`96`	`}`