From e3f96b88f06eca9eaf18cc66898ef05522b4ef16 Mon Sep 17 00:00:00 2001 From: Omar Sweidan Date: Thu, 4 Aug 2022 11:07:19 +0200 Subject: [PATCH] =?utf8?q?String->Document=20f=C3=BCggv=C3=A9ny=20=C3=A1tm?= =?utf8?q?ozgat=C3=A1sa=20XMLUtils-ba?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../AMC/jobs/steps/shared/PBQuery.java | 23 +++--------------- .../server/steps/shared/PBQuery.java | 24 +++---------------- .../src/user/commons/xml/XMLUtils.java | 22 +++++++++++++++++ 3 files changed, 28 insertions(+), 41 deletions(-) diff --git a/server/-product/production/AMC/jobs/steps/shared/PBQuery.java b/server/-product/production/AMC/jobs/steps/shared/PBQuery.java index 1a3e19e4..1c765206 100644 --- a/server/-product/production/AMC/jobs/steps/shared/PBQuery.java +++ b/server/-product/production/AMC/jobs/steps/shared/PBQuery.java @@ -3,7 +3,6 @@ package user.jobengine.server.steps.shared; import java.io.DataInputStream; import java.io.FileNotFoundException; import java.io.IOException; -import java.io.StringReader; import java.net.URL; import java.nio.file.CopyOption; import java.nio.file.DirectoryStream; @@ -24,9 +23,6 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; - import org.apache.commons.lang.StringUtils; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; @@ -46,9 +42,9 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.xml.sax.InputSource; import user.commons.configuration.SystemConfiguration; +import user.commons.xml.XMLUtils; public class PBQuery { public class MMMedia { @@ -81,19 +77,6 @@ public class PBQuery { private static final Path missingSubsRoot = Paths.get("R:\\BeachPool"); private Set subsDirectoriesList; - private static Document toDocument(String xml) { - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); - DocumentBuilder builder = null; - try { - builder = factory.newDocumentBuilder(); - Document doc = builder.parse(new InputSource(new StringReader(xml))); - return doc; - } catch (Exception e) { - logger.error(e.getMessage()); - } - return null; - } - private SimpleDateFormat sdf_range = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss:'00'"); private String primaryEndPoint; private String primaryUserName; @@ -238,7 +221,7 @@ public class PBQuery { return; } - Document document = toDocument(xml); + Document document = XMLUtils.getDocumentFromString(xml); NodeList mediaNodes = document.getElementsByTagName("media"); if (mediaNodes == null || mediaNodes.getLength() == 0) @@ -303,7 +286,7 @@ public class PBQuery { return result; } - Document document = toDocument(xml); + Document document = XMLUtils.getDocumentFromString(xml); NodeList mediaNodes = document.getElementsByTagName("mediaUsage"); if (mediaNodes == null || mediaNodes.getLength() == 0) diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PBQuery.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PBQuery.java index 5e23824f..6d4ba9c3 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PBQuery.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PBQuery.java @@ -3,7 +3,6 @@ package user.jobengine.server.steps.shared; import java.io.DataInputStream; import java.io.FileNotFoundException; import java.io.IOException; -import java.io.StringReader; import java.net.URL; import java.nio.file.CopyOption; import java.nio.file.DirectoryStream; @@ -24,9 +23,6 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; - import org.apache.commons.lang.StringUtils; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; @@ -46,9 +42,9 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.xml.sax.InputSource; import user.commons.configuration.SystemConfiguration; +import user.commons.xml.XMLUtils; public class PBQuery { public class MMMedia { @@ -80,20 +76,6 @@ public class PBQuery { private static final Path subtitleRoot = Paths.get("X:\\PB_ARCH"); private static final Path missingSubsRoot = Paths.get("R:\\BeachPoolSubs"); private Set subsDirectoriesList; - - private static Document toDocument(String xml) { - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); - DocumentBuilder builder = null; - try { - builder = factory.newDocumentBuilder(); - Document doc = builder.parse(new InputSource(new StringReader(xml))); - return doc; - } catch (Exception e) { - logger.error(e.getMessage()); - } - return null; - } - private SimpleDateFormat sdf_range = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss:'00'"); private String primaryEndPoint; private String primaryUserName; @@ -238,7 +220,7 @@ public class PBQuery { return; } - Document document = toDocument(xml); + Document document = XMLUtils.getDocumentFromString(xml); NodeList mediaNodes = document.getElementsByTagName("media"); if (mediaNodes == null || mediaNodes.getLength() == 0) @@ -303,7 +285,7 @@ public class PBQuery { return result; } - Document document = toDocument(xml); + Document document = XMLUtils.getDocumentFromString(xml); NodeList mediaNodes = document.getElementsByTagName("mediaUsage"); if (mediaNodes == null || mediaNodes.getLength() == 0) diff --git a/server/user.jobengine.osgi.commons/src/user/commons/xml/XMLUtils.java b/server/user.jobengine.osgi.commons/src/user/commons/xml/XMLUtils.java index 771ec393..7e054dc0 100644 --- a/server/user.jobengine.osgi.commons/src/user/commons/xml/XMLUtils.java +++ b/server/user.jobengine.osgi.commons/src/user/commons/xml/XMLUtils.java @@ -1,8 +1,11 @@ package user.commons.xml; import java.io.IOException; +import java.io.StringReader; import java.io.StringWriter; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.OutputKeys; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerException; @@ -10,10 +13,15 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; import org.w3c.dom.Node; +import org.xml.sax.InputSource; public final class XMLUtils { + private static final Logger logger = LogManager.getLogger(); + public static String getStringFromDocument(Document document) { StringWriter writer = null; try { @@ -47,4 +55,18 @@ public final class XMLUtils { transformer.transform(new DOMSource(node), new StreamResult(writer)); return writer.toString(); } + + public static Document getDocumentFromString(String xml) { + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + DocumentBuilder builder = null; + try { + builder = factory.newDocumentBuilder(); + Document doc = builder.parse(new InputSource(new StringReader(xml))); + return doc; + } catch (Exception e) { + logger.error(e.getMessage()); + } + return null; + } + } -- 2.54.0