From b5cb29cc1b9a1fd68559368d5de51937b11b32e4 Mon Sep 17 00:00:00 2001 From: dotasek Date: Tue, 25 Jun 2024 12:30:46 -0400 Subject: [PATCH] Remove DebugUtilities references --- .../fhir/convertors/wrapper/ResourceWrapperR4.java | 4 ---- .../org/hl7/fhir/r5/elementmodel/JsonParser.java | 1 - .../org/hl7/fhir/r5/renderers/BundleRenderer.java | 5 +---- .../org/hl7/fhir/r5/renderers/DataRenderer.java | 5 ----- .../fhir/r5/renderers/ProfileDrivenRenderer.java | 5 +---- .../org/hl7/fhir/r5/renderers/ResourceRenderer.java | 13 +++---------- .../r5/renderers/utils/ResourceWrapperNative.java | 8 +------- 7 files changed, 6 insertions(+), 35 deletions(-) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/wrapper/ResourceWrapperR4.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/wrapper/ResourceWrapperR4.java index 573f66119..fcb295067 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/wrapper/ResourceWrapperR4.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/wrapper/ResourceWrapperR4.java @@ -11,7 +11,6 @@ import org.hl7.fhir.r4.model.Narrative; import org.hl7.fhir.r4.model.Property; import org.hl7.fhir.r4.model.Resource; import org.hl7.fhir.r5.renderers.utils.ResourceWrapper; -import org.hl7.fhir.utilities.DebugUtilities; import org.hl7.fhir.utilities.xhtml.NodeType; import org.hl7.fhir.utilities.xhtml.XhtmlNode; @@ -81,9 +80,6 @@ public class ResourceWrapperR4 extends ResourceWrapper { } private ElementKind determineModelKind(Property p, Base v) { - if ("DataRequirement".equals(v.fhirType())) { - DebugUtilities.breakpoint(); - } if (v.isPrimitive()) { return ElementKind.PrimitiveType; } else if (contextUtils.isDatatype(v.fhirType())) { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/JsonParser.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/JsonParser.java index e4e07a849..a0ae9e8c1 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/JsonParser.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/JsonParser.java @@ -63,7 +63,6 @@ import org.hl7.fhir.r5.model.ElementDefinition.TypeRefComponent; import org.hl7.fhir.r5.model.ElementDefinition; import org.hl7.fhir.r5.model.StructureDefinition; import org.hl7.fhir.utilities.CommaSeparatedStringBuilder; -import org.hl7.fhir.utilities.DebugUtilities; import org.hl7.fhir.utilities.StringPair; import org.hl7.fhir.utilities.TextFile; import org.hl7.fhir.utilities.Utilities; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/BundleRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/BundleRenderer.java index 7e3a35193..af90a1187 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/BundleRenderer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/BundleRenderer.java @@ -13,7 +13,6 @@ import org.hl7.fhir.r5.model.Provenance; import org.hl7.fhir.r5.renderers.utils.RenderingContext; import org.hl7.fhir.r5.renderers.utils.ResourceWrapper; import org.hl7.fhir.r5.utils.EOperationOutcome; -import org.hl7.fhir.utilities.DebugUtilities; import org.hl7.fhir.utilities.xhtml.NodeType; import org.hl7.fhir.utilities.xhtml.XhtmlNode; @@ -36,9 +35,7 @@ public class BundleRenderer extends ResourceRenderer { @Override public void buildNarrative(RenderingStatus status, XhtmlNode x, ResourceWrapper b) throws FHIRFormatError, DefinitionException, IOException, FHIRException, EOperationOutcome { - if ("ex-fhir-document-bundle".equals(b.getId())) { - DebugUtilities.breakpoint(); - } + List entries = b.children("entry"); if ("collection".equals(b.primitiveValue("type")) && allEntriesAreHistoryProvenance(entries)) { // nothing diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java index 3bc5ea1ee..88b537e8c 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java @@ -49,7 +49,6 @@ import org.hl7.fhir.r5.terminologies.JurisdictionUtilities; import org.hl7.fhir.r5.terminologies.utilities.ValidationResult; import org.hl7.fhir.r5.utils.ToolingExtensions; import org.hl7.fhir.utilities.CommaSeparatedStringBuilder; -import org.hl7.fhir.utilities.DebugUtilities; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.utilities.VersionUtilities; import org.hl7.fhir.utilities.xhtml.HierarchicalTableGenerator; @@ -983,11 +982,7 @@ public class DataRenderer extends Renderer implements CodeResolver { protected void renderUri(RenderingStatus status, XhtmlNode x, ResourceWrapper uri) throws FHIRFormatError, DefinitionException, IOException { if (!renderPrimitiveWithNoValue(status, x, uri)) { String v = uri.primitiveValue(); - if ("/Binary/1-note".equals(v)) { - DebugUtilities.breakpoint(); - } - if (context.getContextUtilities().isResource(v)) { v = "http://hl7.org/fhir/"+v; } diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ProfileDrivenRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ProfileDrivenRenderer.java index ffb56e8a9..23bf207cc 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ProfileDrivenRenderer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ProfileDrivenRenderer.java @@ -27,7 +27,6 @@ import org.hl7.fhir.r5.utils.ToolingExtensions; import org.hl7.fhir.r5.utils.XVerExtensionManager; import org.hl7.fhir.r5.utils.XVerExtensionManager.XVerExtensionStatus; import org.hl7.fhir.utilities.CommaSeparatedStringBuilder; -import org.hl7.fhir.utilities.DebugUtilities; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.utilities.xhtml.NodeType; import org.hl7.fhir.utilities.xhtml.XhtmlNode; @@ -329,9 +328,7 @@ public class ProfileDrivenRenderer extends ResourceRenderer { if (name.endsWith("[x]")) name = name.substring(0, name.length() - 3); if (showCodeDetails || !isDefaultValue(displayHints, p.getValues())) { - if ("library".equals(name)) { - DebugUtilities.breakpoint(); - } + para.b().addText(name); para.tx(": "); if (renderAsList(child) && p.getValues().size() > 1) { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ResourceRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ResourceRenderer.java index 886474c0a..13eef4a2a 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ResourceRenderer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ResourceRenderer.java @@ -36,7 +36,7 @@ import org.hl7.fhir.r5.utils.EOperationOutcome; import org.hl7.fhir.r5.utils.ToolingExtensions; import org.hl7.fhir.r5.utils.XVerExtensionManager; import org.hl7.fhir.utilities.CommaSeparatedStringBuilder; -import org.hl7.fhir.utilities.DebugUtilities; + import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.utilities.xhtml.HierarchicalTableGenerator; import org.hl7.fhir.utilities.xhtml.HierarchicalTableGenerator.Piece; @@ -532,9 +532,7 @@ public abstract class ResourceRenderer extends DataRenderer { protected void renderUri(RenderingStatus status, ResourceWrapper resource, XhtmlNode x, UriType uri) throws FHIRFormatError, DefinitionException, IOException { if (!renderPrimitiveWithNoValue(status, x, uri)) { String v = uri.primitiveValue(); - if ("/Binary/1-note".equals(v)) { - DebugUtilities.breakpoint(); - } + if (v.startsWith("mailto:")) { x.ah(context.prefixLocalHref(v)).addText(v.substring(7)); } else { @@ -564,9 +562,6 @@ public abstract class ResourceRenderer extends DataRenderer { protected void renderUri(RenderingStatus status, XhtmlNode x, ResourceWrapper uri) throws FHIRFormatError, DefinitionException, IOException { if (!renderPrimitiveWithNoValue(status, x, uri)) { String v = uri.primitiveValue(); - if ("/Binary/1-note".equals(v)) { - DebugUtilities.breakpoint(); - } if (context.getContextUtilities().isResource(v)) { v = "http://hl7.org/fhir/StructureDefinition/"+v; @@ -701,9 +696,7 @@ public abstract class ResourceRenderer extends DataRenderer { if (url == null) { return null; } - if ("http://example.org/fhir/Encounter/doc-example".equals(url)) { - DebugUtilities.breakpoint(); - } + if (url.startsWith("#")) { return resolveContained(resource, url); } else { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/ResourceWrapperNative.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/ResourceWrapperNative.java index e2240484a..95738e245 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/ResourceWrapperNative.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/ResourceWrapperNative.java @@ -10,7 +10,6 @@ import org.hl7.fhir.r5.model.Enumeration; import org.hl7.fhir.r5.model.Narrative; import org.hl7.fhir.r5.model.Property; import org.hl7.fhir.r5.model.Resource; -import org.hl7.fhir.utilities.DebugUtilities; import org.hl7.fhir.utilities.xhtml.NodeType; import org.hl7.fhir.utilities.xhtml.XhtmlNode; @@ -33,9 +32,6 @@ public class ResourceWrapperNative extends ResourceWrapper { self.name = name; self.index = index; self.kind = kind; - if (element == null) { - DebugUtilities.breakpoint(); - } self.element = element; return self; } @@ -65,9 +61,7 @@ public class ResourceWrapperNative extends ResourceWrapper { } protected void loadTheChildren() { - if (element == null) { - DebugUtilities.breakpoint(); - } + for (Property p : element.children()) { String name = p.getName(); int i = 0;