[sonos] adapt to core StringUtils (#15765)

* adapt to core StringUtils --------- Signed-off-by: Leo Siepel <leosiepel@gmail.com>
openhab · Oct 16, 2023 · 381d8ac · 381d8ac
1 parent 84db35d
commit 381d8ac
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 73 deletions.
diff --git a/...rg.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/SonosEntry.java b/...rg.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/SonosEntry.java
@@ -13,10 +13,11 @@
 package org.openhab.binding.sonos.internal;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.openhab.binding.sonos.internal.util.StringUtils;
+import org.openhab.core.util.StringUtils;
 
 /**
  * The {@link SonosEntry} is a datastructure to describe
@@ -120,7 +121,7 @@ public String getAlbum() {
      * @return the URI for the album art.
      */
     public String getAlbumArtUri() {
-        return StringUtils.unEscapeXml(albumArtUri);
+        return Objects.requireNonNull(StringUtils.unEscapeXml(albumArtUri));
     }
 
     /**

diff --git a/...penhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/SonosXMLParser.java b/...penhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/SonosXMLParser.java
@@ -27,7 +27,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.openhab.binding.sonos.internal.util.StringUtils;
+import org.openhab.core.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.Attributes;

diff --git a/...nhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/util/StringUtils.java b/...nhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/util/StringUtils.java