String->Document függvény átmozgatása XMLUtils-ba

diff --git a/server/-product/production/AMC/jobs/steps/shared/PBQuery.java b/server/-product/production/AMC/jobs/steps/shared/PBQuery.java
index 1a3e19e4de8730fe1fed0d4dcb1d362c555f61d9..1c7652067e48e3341173ac3cd2ecd6b08e536d3c 100644 (file)
--- 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;\r
 import java.io.FileNotFoundException;\r
 import java.io.IOException;\r
-import java.io.StringReader;\r
 import java.net.URL;\r
 import java.nio.file.CopyOption;\r
 import java.nio.file.DirectoryStream;\r
@@ -24,9 +23,6 @@ import java.util.Map;
 import java.util.Set;\r
 import java.util.TreeMap;\r
 \r
-import javax.xml.parsers.DocumentBuilder;\r
-import javax.xml.parsers.DocumentBuilderFactory;\r
-\r
 import org.apache.commons.lang.StringUtils;\r
 import org.apache.http.HttpEntity;\r
 import org.apache.http.HttpResponse;\r
@@ -46,9 +42,9 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;\r
 import org.w3c.dom.Node;\r
 import org.w3c.dom.NodeList;\r
-import org.xml.sax.InputSource;\r
 \r
 import user.commons.configuration.SystemConfiguration;\r
+import user.commons.xml.XMLUtils;\r
 \r
 public class PBQuery {\r
        public class MMMedia {\r
@@ -81,19 +77,6 @@ public class PBQuery {
        private static final Path missingSubsRoot = Paths.get("R:\\BeachPool");\r
        private Set<Path> subsDirectoriesList;\r
 \r
-       private static Document toDocument(String xml) {\r
-               DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();\r
-               DocumentBuilder builder = null;\r
-               try {\r
-                       builder = factory.newDocumentBuilder();\r
-                       Document doc = builder.parse(new InputSource(new StringReader(xml)));\r
-                       return doc;\r
-               } catch (Exception e) {\r
-                       logger.error(e.getMessage());\r
-               }\r
-               return null;\r
-       }\r
-\r
        private SimpleDateFormat sdf_range = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss:'00'");\r
        private String primaryEndPoint;\r
        private String primaryUserName;\r
@@ -238,7 +221,7 @@ public class PBQuery {
                        return;\r
                }\r
 \r
-               Document document = toDocument(xml);\r
+               Document document = XMLUtils.getDocumentFromString(xml);\r
                NodeList mediaNodes = document.getElementsByTagName("media");\r
 \r
                if (mediaNodes == null || mediaNodes.getLength() == 0)\r
@@ -303,7 +286,7 @@ public class PBQuery {
                        return result;\r
                }\r
 \r
-               Document document = toDocument(xml);\r
+               Document document = XMLUtils.getDocumentFromString(xml);\r
                NodeList mediaNodes = document.getElementsByTagName("mediaUsage");\r
 \r
                if (mediaNodes == null || mediaNodes.getLength() == 0)\r

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 5e23824f8a0cbfd6db1bff832de519b634598267..6d4ba9c3aa2007456bf2fbd0b5b6d19a1228daff 100644 (file)
--- 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;\r
 import java.io.FileNotFoundException;\r
 import java.io.IOException;\r
-import java.io.StringReader;\r
 import java.net.URL;\r
 import java.nio.file.CopyOption;\r
 import java.nio.file.DirectoryStream;\r
@@ -24,9 +23,6 @@ import java.util.Map;
 import java.util.Set;\r
 import java.util.TreeMap;\r
 \r
-import javax.xml.parsers.DocumentBuilder;\r
-import javax.xml.parsers.DocumentBuilderFactory;\r
-\r
 import org.apache.commons.lang.StringUtils;\r
 import org.apache.http.HttpEntity;\r
 import org.apache.http.HttpResponse;\r
@@ -46,9 +42,9 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;\r
 import org.w3c.dom.Node;\r
 import org.w3c.dom.NodeList;\r
-import org.xml.sax.InputSource;\r
 \r
 import user.commons.configuration.SystemConfiguration;\r
+import user.commons.xml.XMLUtils;\r
 \r
 public class PBQuery {\r
        public class MMMedia {\r
@@ -80,20 +76,6 @@ public class PBQuery {
        private static final Path subtitleRoot = Paths.get("X:\\PB_ARCH");\r
        private static final Path missingSubsRoot = Paths.get("R:\\BeachPoolSubs");\r
        private Set<Path> subsDirectoriesList;\r
-\r
-       private static Document toDocument(String xml) {\r
-               DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();\r
-               DocumentBuilder builder = null;\r
-               try {\r
-                       builder = factory.newDocumentBuilder();\r
-                       Document doc = builder.parse(new InputSource(new StringReader(xml)));\r
-                       return doc;\r
-               } catch (Exception e) {\r
-                       logger.error(e.getMessage());\r
-               }\r
-               return null;\r
-       }\r
-\r
        private SimpleDateFormat sdf_range = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss:'00'");\r
        private String primaryEndPoint;\r
        private String primaryUserName;\r
@@ -238,7 +220,7 @@ public class PBQuery {
                        return;\r
                }\r
 \r
-               Document document = toDocument(xml);\r
+               Document document = XMLUtils.getDocumentFromString(xml);\r
                NodeList mediaNodes = document.getElementsByTagName("media");\r
 \r
                if (mediaNodes == null || mediaNodes.getLength() == 0)\r
@@ -303,7 +285,7 @@ public class PBQuery {
                        return result;\r
                }\r
 \r
-               Document document = toDocument(xml);\r
+               Document document = XMLUtils.getDocumentFromString(xml);\r
                NodeList mediaNodes = document.getElementsByTagName("mediaUsage");\r
 \r
                if (mediaNodes == null || mediaNodes.getLength() == 0)\r

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 771ec393912fe8d1db4949366a72966a3f320dff..7e054dc0bcfab75be9c6bdbdb0ace0dcc271462e 100644 (file)
--- 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;\r
 \r
 import java.io.IOException;\r
+import java.io.StringReader;\r
 import java.io.StringWriter;\r
 \r
+import javax.xml.parsers.DocumentBuilder;\r
+import javax.xml.parsers.DocumentBuilderFactory;\r
 import javax.xml.transform.OutputKeys;\r
 import javax.xml.transform.Transformer;\r
 import javax.xml.transform.TransformerException;\r
@@ -10,10 +13,15 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;\r
 import javax.xml.transform.stream.StreamResult;\r
 \r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
 import org.w3c.dom.Document;\r
 import org.w3c.dom.Node;\r
+import org.xml.sax.InputSource;\r
 \r
 public final class XMLUtils {\r
+       private static final Logger logger = LogManager.getLogger();\r
+\r
        public static String getStringFromDocument(Document document) {\r
                StringWriter writer = null;\r
                try {\r
@@ -47,4 +55,18 @@ public final class XMLUtils {
                transformer.transform(new DOMSource(node), new StreamResult(writer));\r
                return writer.toString();\r
        }\r
+\r
+       public static Document getDocumentFromString(String xml) {\r
+               DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();\r
+               DocumentBuilder builder = null;\r
+               try {\r
+                       builder = factory.newDocumentBuilder();\r
+                       Document doc = builder.parse(new InputSource(new StringReader(xml)));\r
+                       return doc;\r
+               } catch (Exception e) {\r
+                       logger.error(e.getMessage());\r
+               }\r
+               return null;\r
+       }\r
+\r
 }\r