From c4f3b26ae5eeb6d21af1db9f0cc92b5353676721 Mon Sep 17 00:00:00 2001
From: Wouter Born <github@maindrain.net>
Date: Sat, 19 Oct 2024 18:56:27 +0200
Subject: [PATCH] Upgrade lastnpe EEA to 2.4.0

For release notes, see:

https://github.com/lastnpe/eclipse-null-eea-augments/releases/tag/v2.4.0

Signed-off-by: Wouter Born <github@maindrain.net>
---
 .../cometvisu/internal/backend/sitemap/VisuConfig.java   | 3 ++-
 .../ui/cometvisu/internal/util/ClientInstaller.java      | 5 ++++-
 .../org/openhab/ui/cometvisu/internal/util/FsUtil.java   | 9 ++++++---
 pom.xml                                                  | 2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/backend/sitemap/VisuConfig.java b/bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/backend/sitemap/VisuConfig.java
index 746700020f..76c9a34380 100644
--- a/bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/backend/sitemap/VisuConfig.java
+++ b/bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/backend/sitemap/VisuConfig.java
@@ -16,6 +16,7 @@
 import java.io.StringWriter;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.Objects;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.xml.XMLConstants;
@@ -117,7 +118,7 @@ public String getConfigXml(HttpServletRequest req) {
 
         // set relative path to XSD file
         File rootFolder = new File(Config.cometvisuWebfolder);
-        File file = new File(rootFolder, req.getPathInfo());
+        File file = new File(rootFolder, Objects.requireNonNull(req.getPathInfo(), "Path info should not be null"));
         String relXsd = "";
         File parent = file.getParentFile();
         File schema = new File(parent, "visu_config.xsd");
diff --git a/bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/util/ClientInstaller.java b/bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/util/ClientInstaller.java
index 87954efddc..acdb23cdc7 100644
--- a/bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/util/ClientInstaller.java
+++ b/bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/util/ClientInstaller.java
@@ -309,7 +309,10 @@ private void extractFolder(String folderName, ZipFile zipFile, String destDir) {
                         // never ever overwrite existing config files
                         continue;
                     }
-                    new File(file.getParent()).mkdirs();
+                    String parent = file.getParent();
+                    if (parent != null) {
+                        new File(parent).mkdirs();
+                    }
 
                     try (InputStream is = zipFile.getInputStream(entry); OutputStream os = new FileOutputStream(file)) {
                         for (int len; (len = is.read(BUFFER)) != -1;) {
diff --git a/bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/util/FsUtil.java b/bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/util/FsUtil.java
index 9de6c216a6..0d325d5abc 100644
--- a/bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/util/FsUtil.java
+++ b/bundles/org.openhab.ui.cometvisu/src/main/java/org/openhab/ui/cometvisu/internal/util/FsUtil.java
@@ -113,9 +113,12 @@ public boolean isInTrash(File file) {
     }
 
     public void saveFile(File file, InputStream fileInputStream, String hash) throws FileOperationException {
-        File parentDir = new File(file.getParent());
-        if (!parentDir.exists()) {
-            parentDir.mkdirs();
+        String parent = file.getParent();
+        if (parent != null) {
+            File parentDir = new File(parent);
+            if (!parentDir.exists()) {
+                parentDir.mkdirs();
+            }
         }
         // check hash
         try {
diff --git a/pom.xml b/pom.xml
index d28580bc83..0e14c81870 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
     <maven.compiler.release>${oh.java.version}</maven.compiler.release>
 
     <bnd.version>7.0.0</bnd.version>
-    <eea.version>2.3.0</eea.version>
+    <eea.version>2.4.0</eea.version>
     <jackson.version>2.16.0</jackson.version>
     <karaf.version>4.4.6</karaf.version>
     <ohc.version>4.3.0-SNAPSHOT</ohc.version>