public
/
openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[sonos] adapt to core StringUtils (#15765) 

* adapt to core StringUtils

---------

Signed-off-by: Leo Siepel <leosiepel@gmail.com>
This commit is contained in:
lsiepel 2023-10-16 23:27:31 +02:00 committed by GitHub
parent 84db35d656
commit 381d8ac93b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/SonosEntry.java
View File

@ -13,10 +13,11 @@
package org.openhab.binding.sonos.internal; package org.openhab.binding.sonos.internal;
import java.io.Serializable; import java.io.Serializable;
import java.util.Objects;
import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable; 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 * The {@link SonosEntry} is a datastructure to describe
@ -120,7 +121,7 @@ public class SonosEntry implements Serializable {
* @return the URI for the album art. * @return the URI for the album art.
*/ */
public String getAlbumArtUri() { public String getAlbumArtUri() {
return StringUtils.unEscapeXml(albumArtUri); return Objects.requireNonNull(StringUtils.unEscapeXml(albumArtUri));
} }
/** /**

2
bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/SonosXMLParser.java
View File

@ -27,7 +27,7 @@ import java.util.regex.Pattern;
import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable; 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.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.xml.sax.Attributes; import org.xml.sax.Attributes;

70
bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/util/StringUtils.java
View File

@ -1,70 +0,0 @@
/**
* Copyright (c) 2010-2023 Contributors to the openHAB project
*
* See the NOTICE file(s) distributed with this work for additional
* information.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.sonos.internal.util;
import org.eclipse.jdt.annotation.NonNullByDefault;
/**
* The {@link StringUtils} class defines some static string utility methods
*
* @author Leo Siepel - Initial contribution
*/
@NonNullByDefault
public class StringUtils {
/**
* Simple method to escape XML special characters in String.
* There are five XML Special characters which needs to be escaped:
*
* <pre>
* {@code
* & - &amp;
* < - &lt;
* > - &gt;
* " - &quot;
* ' - &apos;
* }
* </pre>
*/
public static String escapeXml(String xml) {
xml = xml.replace("&", "&amp;");
xml = xml.replace("<", "&lt;");
xml = xml.replace(">", "&gt;");
xml = xml.replace("\"", "&quot;");
xml = xml.replace("'", "&apos;");
return xml;
}
/**
* Simple method to un escape XML special characters in String.
* There are five XML Special characters which needs to be escaped :
*
* <pre>
* {@code
* & - &amp;
* < - &lt;
* > - &gt;
* " - &quot;
* ' - &apos;
* }
* </pre>
*/
public static String unEscapeXml(String xml) {
xml = xml.replace("&amp;", "&");
xml = xml.replace("&lt;", "<");
xml = xml.replace("&gt;", ">");
xml = xml.replace("&quot;", "\"");
xml = xml.replace("&apos;", "'");
return xml;
}
}