[addoninfp] adopt reviewer suggestions

Signed-off-by: Andrew Fiddian-Green <[email protected]>
openhab · Nov 23, 2023 · 16845c5 · 16845c5
1 parent b786ac8
commit 16845c5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/...hab.core.addon/src/main/java/org/openhab/core/addon/infoproviders/AddonsInfoProvider.java b/...hab.core.addon/src/main/java/org/openhab/core/addon/infoproviders/AddonsInfoProvider.java
@@ -88,10 +88,10 @@ private void initialize() {
         Stream.of(new File(folder).listFiles()).filter(f -> f.isFile() && f.getName().endsWith(".xml")).forEach(f -> {
             try {
                 String xml = Files.readString(f.toPath());
-                if (!xml.isBlank()) {
+                if (xml != null && !xml.isBlank()) {
                     addonInfos.addAll(reader.readFromXML(xml).getAddons().stream().collect(Collectors.toSet()));
                 } else {
-                    logger.warn("File '{}' is empty", f.getName());
+                    logger.warn("File '{}' contents are null or empty", f.getName());
                 }
             } catch (IOException e) {
                 logger.warn("File '{}' could not be read", f.getName());

diff --git a/...re.config.core/src/main/java/org/openhab/core/config/core/xml/util/XmlDocumentReader.java b/...re.config.core/src/main/java/org/openhab/core/config/core/xml/util/XmlDocumentReader.java
@@ -109,8 +109,6 @@ protected void configureSecurity(XStream xstream) {
     /**
      * Reads the XML document containing a specific XML tag from the specified xml string and converts it to the
      * according object.
-     * <p>
-     * This method returns {@code null} if the given URL is {@code null}.
      *
      * @param xml a string containing the XML document to be read.
      * @return the conversion result object (could be null).