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

[upnpcontrol] Remove org.apache.common (#14439) 

Signed-off-by: lsiepel <leosiepel@gmail.com>
This commit is contained in:
lsiepel 2023-02-19 20:42:01 +01:00 committed by GitHub
parent 9f7a21cb14
commit 833578b0e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 65 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/queue/UpnpEntry.java
View File

@ -18,9 +18,9 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.apache.commons.lang3.StringEscapeUtils;
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.upnpcontrol.internal.util.StringUtils;
/** /**
* *
@ -178,7 +178,7 @@ public class UpnpEntry {
* @return the URI for the album art. * @return the URI for the album art.
*/ */
public String getAlbumArtUri() { public String getAlbumArtUri() {
return StringEscapeUtils.unescapeXml(albumArtUri); return StringUtils.unEscapeXml(albumArtUri);
} }
/** /**

57
bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/util/StringUtils.java Normal file
View File

@ -0,0 +1,57 @@
/**
* 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.upnpcontrol.internal.util;
/**
* The {@link StringUtils} class defines some static string utility methods
*
* @author Leo Siepel - Initial contribution
*/
public class StringUtils {
/**
* Simple method to escape XML special characters in String.
* There are five XML Special characters which needs to be escaped :
* & - &amp;
* < - &lt;
* > - &gt;
* " - &quot;
* ' - &apos;
*/
public static String escapeXml(String xml) {
xml = xml.replaceAll("&", "&amp;");
xml = xml.replaceAll("<", "&lt;");
xml = xml.replaceAll(">", "&gt;");
xml = xml.replaceAll("\"", "&quot;");
xml = xml.replaceAll("'", "&apos;");
return xml;
}
/**
* Simple method to un escape XML special characters in String.
* There are five XML Special characters which needs to be escaped :
* & - &amp;
* < - &lt;
* > - &gt;
* " - &quot;
* ' - &apos;
*/
public static String unEscapeXml(String xml) {
xml = xml.replaceAll("&amp;", "&");
xml = xml.replaceAll("&lt;", "<");
xml = xml.replaceAll("&gt;", ">");
xml = xml.replaceAll("&quot;", "\"");
xml = xml.replaceAll("&apos;", "'");
return xml;
}
}

13
bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/util/UpnpXMLParser.java
View File

@ -25,7 +25,6 @@ import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory; import javax.xml.parsers.SAXParserFactory;
import org.apache.commons.lang3.StringEscapeUtils;
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.upnpcontrol.internal.queue.UpnpEntry; import org.openhab.binding.upnpcontrol.internal.queue.UpnpEntry;
@ -406,14 +405,14 @@ public class UpnpXMLParser {
public static String compileMetadataString(UpnpEntry entry) { public static String compileMetadataString(UpnpEntry entry) {
String id = entry.getId(); String id = entry.getId();
String parentId = entry.getParentId(); String parentId = entry.getParentId();
String title = StringEscapeUtils.escapeXml(entry.getTitle()); String title = StringUtils.escapeXml(entry.getTitle());
String upnpClass = entry.getUpnpClass(); String upnpClass = entry.getUpnpClass();
String album = StringEscapeUtils.escapeXml(entry.getAlbum()); String album = StringUtils.escapeXml(entry.getAlbum());
String albumArtUri = entry.getAlbumArtUri(); String albumArtUri = entry.getAlbumArtUri();
String creator = StringEscapeUtils.escapeXml(entry.getCreator()); String creator = StringUtils.escapeXml(entry.getCreator());
String artist = StringEscapeUtils.escapeXml(entry.getArtist()); String artist = StringUtils.escapeXml(entry.getArtist());
String publisher = StringEscapeUtils.escapeXml(entry.getPublisher()); String publisher = StringUtils.escapeXml(entry.getPublisher());
String genre = StringEscapeUtils.escapeXml(entry.getGenre()); String genre = StringUtils.escapeXml(entry.getGenre());
Integer trackNumber = entry.getOriginalTrackNumber(); Integer trackNumber = entry.getOriginalTrackNumber();
final MessageFormat messageFormat = new MessageFormat(METADATA_PATTERN); final MessageFormat messageFormat = new MessageFormat(METADATA_PATTERN);