From 4e2d6732d4c2ecf27d6800cfa6badae7a24f10c9 Mon Sep 17 00:00:00 2001
From: Nicolas Crouzier <nicolas.crouzier@nist.gov>
Date: Mon, 14 Nov 2022 17:47:22 -0500
Subject: [PATCH] xinclude setting

---
 .../java/gov/nist/hit/core/hl7v2/service/ConstraintManager.java | 2 ++
 .../gov/nist/hit/core/hl7v2/service/HL7V2ProfileParser.java     | 1 +
 .../nist/hit/core/hl7v2/service/impl/PackagingHandlerImpl.java  | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/hit-core-hl7v2-service/src/main/java/gov/nist/hit/core/hl7v2/service/ConstraintManager.java b/hit-core-hl7v2-service/src/main/java/gov/nist/hit/core/hl7v2/service/ConstraintManager.java
index 6273396..7f018fe 100644
--- a/hit-core-hl7v2-service/src/main/java/gov/nist/hit/core/hl7v2/service/ConstraintManager.java
+++ b/hit-core-hl7v2-service/src/main/java/gov/nist/hit/core/hl7v2/service/ConstraintManager.java
@@ -47,6 +47,7 @@ public ConstraintManager(String constraintXml) {
     try {
       if (constraintXml != null) {
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        factory.setXIncludeAware(false);
         DocumentBuilder builder = factory.newDocumentBuilder();
         doc = builder.parse(IOUtils.toInputStream(constraintXml));
       }
@@ -62,6 +63,7 @@ public ConstraintManager(String constraintXml, String additionalConstraintXml) {
     try {
       if (constraintXml != null) {
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        factory.setXIncludeAware(false);
         DocumentBuilder builder = factory.newDocumentBuilder();
         doc = builder.parse(IOUtils.toInputStream(constraintXml));
       }
diff --git a/hit-core-hl7v2-service/src/main/java/gov/nist/hit/core/hl7v2/service/HL7V2ProfileParser.java b/hit-core-hl7v2-service/src/main/java/gov/nist/hit/core/hl7v2/service/HL7V2ProfileParser.java
index ed81e76..0e96076 100644
--- a/hit-core-hl7v2-service/src/main/java/gov/nist/hit/core/hl7v2/service/HL7V2ProfileParser.java
+++ b/hit-core-hl7v2-service/src/main/java/gov/nist/hit/core/hl7v2/service/HL7V2ProfileParser.java
@@ -531,6 +531,7 @@ private ProfileElement process(Component c, ProfileElement parent)
 
 	private Document toDoc(String xmlSource) {
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+		factory.setXIncludeAware(false);
 		factory.setNamespaceAware(true);
 		factory.setIgnoringComments(false);
 		factory.setIgnoringElementContentWhitespace(true);
diff --git a/hit-core-hl7v2-service/src/main/java/gov/nist/hit/core/hl7v2/service/impl/PackagingHandlerImpl.java b/hit-core-hl7v2-service/src/main/java/gov/nist/hit/core/hl7v2/service/impl/PackagingHandlerImpl.java
index d1cd035..71ab9d7 100644
--- a/hit-core-hl7v2-service/src/main/java/gov/nist/hit/core/hl7v2/service/impl/PackagingHandlerImpl.java
+++ b/hit-core-hl7v2-service/src/main/java/gov/nist/hit/core/hl7v2/service/impl/PackagingHandlerImpl.java
@@ -133,6 +133,7 @@ public File zip(List<File> files, String filename) throws Exception {
 
 	protected Document toDoc(String xmlSource) {
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+		factory.setXIncludeAware(false);
 		factory.setNamespaceAware(true);
 		factory.setIgnoringComments(false);
 		factory.setIgnoringElementContentWhitespace(true);
@@ -201,6 +202,7 @@ public String changeVsId(String content) throws Exception {
 
 	public static Document stringToDom(String xmlSource) {
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+		factory.setXIncludeAware(false);
 		factory.setNamespaceAware(true);
 		factory.setIgnoringComments(false);
 		factory.setIgnoringElementContentWhitespace(true);