From 22ccde016d67283f607e84e2f559e31697040421 Mon Sep 17 00:00:00 2001 From: lsiepel Date: Sun, 19 Feb 2023 20:43:01 +0100 Subject: [PATCH] [sonos] Remove org.apache.common (#14438) Signed-off-by: lsiepel --- .../binding/sonos/internal/SonosEntry.java | 4 +- .../sonos/internal/util/StringUtils.java | 39 +++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/util/StringUtils.java diff --git a/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/SonosEntry.java b/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/SonosEntry.java index e950b90f3..6acea1058 100644 --- a/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/SonosEntry.java +++ b/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/SonosEntry.java @@ -14,9 +14,9 @@ package org.openhab.binding.sonos.internal; import java.io.Serializable; -import org.apache.commons.lang3.StringEscapeUtils; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; +import org.openhab.binding.sonos.internal.util.StringUtils; /** * The {@link SonosEntry} is a datastructure to describe @@ -120,7 +120,7 @@ public class SonosEntry implements Serializable { * @return the URI for the album art. */ public String getAlbumArtUri() { - return StringEscapeUtils.unescapeXml(albumArtUri); + return StringUtils.unEscapeXml(albumArtUri); } /** diff --git a/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/util/StringUtils.java b/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/util/StringUtils.java new file mode 100644 index 000000000..4127a3d11 --- /dev/null +++ b/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/util/StringUtils.java @@ -0,0 +1,39 @@ +/** + * 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; + +/** + * The {@link StringUtils} class defines some static string utility methods + * + * @author Leo Siepel - Initial contribution + */ +public class StringUtils { + + /** + * Simple method to un escape XML special characters in String. + * There are five XML Special characters which needs to be escaped : + * & - & + * < - < + * > - > + * " - " + * ' - ' + */ + public static String unEscapeXml(String xml) { + xml = xml.replaceAll("&", "&"); + xml = xml.replaceAll("<", "<"); + xml = xml.replaceAll(">", ">"); + xml = xml.replaceAll(""", "\""); + xml = xml.replaceAll("'", "'"); + return xml; + } +}