honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make xhtml nodes use less memory

This commit is contained in:
Grahame Grieve 2023-03-06 10:32:54 +11:00
parent 348f213a96
commit 36d22c522a
2 changed files with 111 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/CodeSystemUtilities.java
View File

@ -415,6 +415,22 @@ public class CodeSystemUtilities {
return cs; return cs;
} }
public static boolean checkMakeShareable(CodeSystem cs) {
boolean changed = false;
if (!cs.hasExperimental()) {
cs.setExperimental(false);
changed = true;
}
if (!cs.hasMeta())
cs.setMeta(new Meta());
for (UriType t : cs.getMeta().getProfile())
if ("http://hl7.org/fhir/StructureDefinition/shareablecodesystem".equals(t.getValue()))
return changed;
cs.getMeta().getProfile().add(new CanonicalType("http://hl7.org/fhir/StructureDefinition/shareablecodesystem"));
return true;
}
public static void setOID(CodeSystem cs, String oid) { public static void setOID(CodeSystem cs, String oid) {
if (!oid.startsWith("urn:oid:")) if (!oid.startsWith("urn:oid:"))
oid = "urn:oid:" + oid; oid = "urn:oid:" + oid;

151
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlNode.java
View File

@ -81,8 +81,8 @@ public class XhtmlNode extends XhtmlFluent implements IBaseXhtml {
private Location location; private Location location;
private NodeType nodeType; private NodeType nodeType;
private String name; private String name;
private Map<String, String> attributes = new HashMap<String, String>(); protected Map<String, String> attributes;
private XhtmlNodeList childNodes = new XhtmlNodeList(); protected XhtmlNodeList childNodes;
private String content; private String content;
private boolean notPretty; private boolean notPretty;
private boolean seperated; private boolean seperated;
@ -122,11 +122,26 @@ public class XhtmlNode extends XhtmlFluent implements IBaseXhtml {
return this; return this;
} }
public boolean hasAttributes() {
return attributes != null && !attributes.isEmpty();
}
public Map<String, String> getAttributes() { public Map<String, String> getAttributes() {
if (attributes == null) {
attributes = new HashMap<String, String>();
}
return attributes; return attributes;
} }
public boolean hasChildren() {
return childNodes != null && !childNodes.isEmpty();
}
public XhtmlNodeList getChildNodes() { public XhtmlNodeList getChildNodes() {
if (childNodes == null) {
childNodes = new XhtmlNodeList();
}
return childNodes; return childNodes;
} }
@ -151,19 +166,21 @@ public class XhtmlNode extends XhtmlFluent implements IBaseXhtml {
"code", "samp", "img", "map", "area")) { "code", "samp", "img", "map", "area")) {
errors.add("Error at "+path+": Found "+name+" in a resource"); errors.add("Error at "+path+": Found "+name+" in a resource");
} }
for (String an : attributes.keySet()) { if (hasAttributes()) {
boolean ok = an.startsWith("xmlns") || Utilities.existsInList(an, for (String an : attributes.keySet()) {
"title", "style", "class", "ID", "lang", "xml:lang", "dir", "accesskey", "tabindex", boolean ok = an.startsWith("xmlns") || Utilities.existsInList(an,
// tables "title", "style", "class", "ID", "lang", "xml:lang", "dir", "accesskey", "tabindex",
"span", "width", "align", "valign", "char", "charoff", "abbr", "axis", "headers", "scope", "rowspan", "colspan") || // tables
Utilities.existsInList(name + "." + an, "a.href", "a.name", "img.src", "img.border", "div.xmlns", "blockquote.cite", "q.cite", "span", "width", "align", "valign", "char", "charoff", "abbr", "axis", "headers", "scope", "rowspan", "colspan") ||
"a.charset", "a.type", "a.name", "a.href", "a.hreflang", "a.rel", "a.rev", "a.shape", "a.coords", "img.src", Utilities.existsInList(name + "." + an, "a.href", "a.name", "img.src", "img.border", "div.xmlns", "blockquote.cite", "q.cite",
"img.alt", "img.longdesc", "img.height", "img.width", "img.usemap", "img.ismap", "map.name", "area.shape", "a.charset", "a.type", "a.name", "a.href", "a.hreflang", "a.rel", "a.rev", "a.shape", "a.coords", "img.src",
"area.coords", "area.href", "area.nohref", "area.alt", "table.summary", "table.width", "table.border", "img.alt", "img.longdesc", "img.height", "img.width", "img.usemap", "img.ismap", "map.name", "area.shape",
"table.frame", "table.rules", "table.cellspacing", "table.cellpadding", "pre.space", "td.nowrap" "area.coords", "area.href", "area.nohref", "area.alt", "table.summary", "table.width", "table.border",
); "table.frame", "table.rules", "table.cellspacing", "table.cellpadding", "pre.space", "td.nowrap"
if (!ok) );
errors.add("Error at "+path+": Found attribute "+name+"."+an+" in a resource"); if (!ok)
errors.add("Error at "+path+": Found attribute "+name+"."+an+" in a resource");
}
} }
} }
if (inPara && Utilities.existsInList(name, "div", "blockquote", "table", "ol", "ul", "p")) { if (inPara && Utilities.existsInList(name, "div", "blockquote", "table", "ol", "ul", "p")) {
@ -173,7 +190,7 @@ public class XhtmlNode extends XhtmlFluent implements IBaseXhtml {
errors.add("Error at "+path+": Found an <a> inside an <a> paragraph"); errors.add("Error at "+path+": Found an <a> inside an <a> paragraph");
} }
if (childNodes != null) { if (hasChildren()) {
if ("p".equals(name)) { if ("p".equals(name)) {
inPara = true; inPara = true;
} }
@ -202,13 +219,13 @@ public class XhtmlNode extends XhtmlFluent implements IBaseXhtml {
// } // }
XhtmlNode node = new XhtmlNode(NodeType.Element); XhtmlNode node = new XhtmlNode(NodeType.Element);
node.setName(name); node.setName(name);
if (childNodes.isInPara() || name.equals("p")) { if (getChildNodes().isInPara() || name.equals("p")) {
node.getChildNodes().setInPara(true); node.getChildNodes().setInPara(true);
} }
if (childNodes.isInLink() || name.equals("a")) { if (getChildNodes().isInLink() || name.equals("a")) {
node.getChildNodes().setInLink(true); node.getChildNodes().setInLink(true);
} }
childNodes.add(node); getChildNodes().add(node);
return node; return node;
} }
@ -218,14 +235,14 @@ public class XhtmlNode extends XhtmlFluent implements IBaseXhtml {
if (!(nodeType == NodeType.Element || nodeType == NodeType.Document)) if (!(nodeType == NodeType.Element || nodeType == NodeType.Document))
throw new Error("Wrong node type. is "+nodeType.toString()); throw new Error("Wrong node type. is "+nodeType.toString());
XhtmlNode node = new XhtmlNode(NodeType.Element); XhtmlNode node = new XhtmlNode(NodeType.Element);
if (childNodes.isInPara() || name.equals("p")) { if (getChildNodes().isInPara() || name.equals("p")) {
node.getChildNodes().setInPara(true); node.getChildNodes().setInPara(true);
} }
if (childNodes.isInLink() || name.equals("a")) { if (getChildNodes().isInLink() || name.equals("a")) {
node.getChildNodes().setInLink(true); node.getChildNodes().setInLink(true);
} }
node.setName(name); node.setName(name);
childNodes.add(index, node); getChildNodes().add(index, node);
return node; return node;
} }
@ -235,7 +252,7 @@ public class XhtmlNode extends XhtmlFluent implements IBaseXhtml {
throw new Error("Wrong node type"); throw new Error("Wrong node type");
XhtmlNode node = new XhtmlNode(NodeType.Comment); XhtmlNode node = new XhtmlNode(NodeType.Comment);
node.setContent(content); node.setContent(content);
childNodes.add(node); getChildNodes().add(node);
return node; return node;
} }
@ -245,7 +262,7 @@ public class XhtmlNode extends XhtmlFluent implements IBaseXhtml {
throw new Error("Wrong node type"); throw new Error("Wrong node type");
XhtmlNode node = new XhtmlNode(NodeType.DocType); XhtmlNode node = new XhtmlNode(NodeType.DocType);
node.setContent(content); node.setContent(content);
childNodes.add(node); getChildNodes().add(node);
return node; return node;
} }
@ -255,7 +272,7 @@ public class XhtmlNode extends XhtmlFluent implements IBaseXhtml {
throw new Error("Wrong node type"); throw new Error("Wrong node type");
XhtmlNode node = new XhtmlNode(NodeType.Instruction); XhtmlNode node = new XhtmlNode(NodeType.Instruction);
node.setContent(content); node.setContent(content);
childNodes.add(node); getChildNodes().add(node);
return node; return node;
} }
public XhtmlNode addText(String content) public XhtmlNode addText(String content)
@ -265,7 +282,7 @@ public class XhtmlNode extends XhtmlFluent implements IBaseXhtml {
if (content != null) { if (content != null) {
XhtmlNode node = new XhtmlNode(NodeType.Text); XhtmlNode node = new XhtmlNode(NodeType.Text);
node.setContent(content); node.setContent(content);
childNodes.add(node); getChildNodes().add(node);
return node; return node;
} else } else
return null; return null;
@ -280,35 +297,42 @@ public class XhtmlNode extends XhtmlFluent implements IBaseXhtml {
XhtmlNode node = new XhtmlNode(NodeType.Text); XhtmlNode node = new XhtmlNode(NodeType.Text);
node.setContent(content); node.setContent(content);
childNodes.add(index, node); getChildNodes().add(index, node);
return node; return node;
} }
public boolean allChildrenAreText() public boolean allChildrenAreText()
{ {
boolean res = true; boolean res = true;
for (XhtmlNode n : childNodes) if (hasChildren()) {
res = res && n.getNodeType() == NodeType.Text; for (XhtmlNode n : childNodes)
res = res && n.getNodeType() == NodeType.Text;
}
return res; return res;
} }
public XhtmlNode getElement(String name) { public XhtmlNode getElement(String name) {
for (XhtmlNode n : childNodes) if (hasChildren()) {
if (n.getNodeType() == NodeType.Element && name.equals(n.getName())) for (XhtmlNode n : childNodes)
return n; if (n.getNodeType() == NodeType.Element && name.equals(n.getName()))
return n;
}
return null; return null;
} }
public XhtmlNode getFirstElement() { public XhtmlNode getFirstElement() {
for (XhtmlNode n : childNodes) if (hasChildren()) {
if (n.getNodeType() == NodeType.Element) for (XhtmlNode n : childNodes)
return n; if (n.getNodeType() == NodeType.Element)
return n;
}
return null; return null;
} }
public String allText() { public String allText() {
if (childNodes == null || childNodes.isEmpty()) if (!hasChildren()) {
return getContent(); return getContent();
}
StringBuilder b = new StringBuilder(); StringBuilder b = new StringBuilder();
for (XhtmlNode n : childNodes) for (XhtmlNode n : childNodes)
@ -326,16 +350,16 @@ public class XhtmlNode extends XhtmlFluent implements IBaseXhtml {
throw new Error("name is null"); throw new Error("name is null");
if (value == null) if (value == null)
throw new Error("value is null"); throw new Error("value is null");
attributes.put(name, value); getAttributes().put(name, value);
return this; return this;
} }
public boolean hasAttribute(String name) { public boolean hasAttribute(String name) {
return getAttributes().containsKey(name); return hasAttributes() && getAttributes().containsKey(name);
} }
public String getAttribute(String name) { public String getAttribute(String name) {
return getAttributes().get(name); return hasAttributes() ? getAttributes().get(name) : null;
} }
public XhtmlNode setAttribute(String name, String value) { public XhtmlNode setAttribute(String name, String value) {
@ -349,18 +373,22 @@ public class XhtmlNode extends XhtmlFluent implements IBaseXhtml {
public XhtmlNode copy() { public XhtmlNode copy() {
XhtmlNode dst = new XhtmlNode(nodeType); XhtmlNode dst = new XhtmlNode(nodeType);
dst.name = name; dst.name = name;
for (String n : attributes.keySet()) { if (hasAttributes()) {
dst.attributes.put(n, attributes.get(n)); for (String n : attributes.keySet()) {
dst.getAttributes().put(n, attributes.get(n));
}
}
if (hasChildren()) {
for (XhtmlNode n : childNodes)
dst.getChildNodes().add(n.copy());
} }
for (XhtmlNode n : childNodes)
dst.childNodes.add(n.copy());
dst.content = content; dst.content = content;
return dst; return dst;
} }
@Override @Override
public boolean isEmpty() { public boolean isEmpty() {
return (childNodes == null || childNodes.isEmpty()) && content == null; return !hasChildren() && content == null;
} }
public boolean equalsDeep(XhtmlNode other) { public boolean equalsDeep(XhtmlNode other) {
@ -370,16 +398,26 @@ public class XhtmlNode extends XhtmlFluent implements IBaseXhtml {
if (!(nodeType == other.nodeType) || !compare(name, other.name) || !compare(content, other.content)) if (!(nodeType == other.nodeType) || !compare(name, other.name) || !compare(content, other.content))
return false; return false;
if (attributes.size() != other.attributes.size()) if (hasAttributes() != other.hasAttributes()) {
return false; return false;
for (String an : attributes.keySet()) }
if (!attributes.get(an).equals(other.attributes.get(an))) if (hasAttributes()) {
if (attributes.size() != other.attributes.size())
return false; return false;
if (childNodes.size() != other.childNodes.size()) for (String an : attributes.keySet())
if (!attributes.get(an).equals(other.attributes.get(an)))
return false;
}
if (hasChildren() != other.hasChildren()) {
return false; return false;
for (int i = 0; i < childNodes.size(); i++) { }
if (!compareDeep(childNodes.get(i), other.childNodes.get(i))) if (hasChildren()) {
if (childNodes.size() != other.childNodes.size())
return false; return false;
for (int i = 0; i < childNodes.size(); i++) {
if (!compareDeep(childNodes.get(i), other.childNodes.get(i)))
return false;
}
} }
return true; return true;
} }
@ -401,9 +439,11 @@ public class XhtmlNode extends XhtmlFluent implements IBaseXhtml {
} }
public String getNsDecl() { public String getNsDecl() {
for (String an : attributes.keySet()) { if (hasAttributes()) {
if (an.equals("xmlns")) { for (String an : attributes.keySet()) {
return attributes.get(an); if (an.equals("xmlns")) {
return attributes.get(an);
}
} }
} }
return null; return null;
@ -462,8 +502,8 @@ public class XhtmlNode extends XhtmlFluent implements IBaseXhtml {
try { try {
XhtmlDocument fragment = new XhtmlParser().parse(val, "div"); XhtmlDocument fragment = new XhtmlParser().parse(val, "div");
this.attributes = fragment.getAttributes(); this.attributes = fragment.attributes;
this.childNodes = fragment.getChildNodes(); this.childNodes = fragment.childNodes;
// Strip the <? .. ?> declaration if one was present // Strip the <? .. ?> declaration if one was present
if (childNodes.size() > 0 && childNodes.get(0) != null && childNodes.get(0).getNodeType() == NodeType.Instruction) { if (childNodes.size() > 0 && childNodes.get(0) != null && childNodes.get(0).getNodeType() == NodeType.Instruction) {
childNodes.remove(0); childNodes.remove(0);
@ -475,7 +515,6 @@ public class XhtmlNode extends XhtmlFluent implements IBaseXhtml {
// TODO: composer shouldn't throw exception like this // TODO: composer shouldn't throw exception like this
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
public XhtmlNode getElementByIndex(int i) { public XhtmlNode getElementByIndex(int i) {