From fb9b123c655f75fd04e4be4d302ca5237861682a Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Wed, 10 Jun 2020 09:00:51 +1000 Subject: [PATCH 1/6] override Element extension methods to also check for modifierExtensions --- .../hl7/fhir/r5/model/BackboneElement.java | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneElement.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneElement.java index fd2c5bca1..74c7029e8 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneElement.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneElement.java @@ -241,6 +241,81 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or } + public void addModifierExtension(String url, DataType value) { + if (isDisallowExtensions()) + throw new Error("Extensions are not allowed in this context"); + Extension ex = new Extension(); + ex.setUrl(url); + ex.setValue(value); + getModifierExtension().add(ex); + } + + + public Extension getExtensionByUrl(String theUrl) { + org.apache.commons.lang3.Validate.notBlank(theUrl, "theUrl must not be blank or null"); + ArrayList retVal = new ArrayList(); + Extension res = super.getExtensionByUrl(theUrl); + if (res != null) { + retVal.add(res); + } + for (Extension next : getModifierExtension()) { + if (theUrl.equals(next.getUrl())) { + retVal.add(next); + } + } + if (retVal.size() == 0) + return null; + else { + org.apache.commons.lang3.Validate.isTrue(retVal.size() == 1, "Url "+theUrl+" must have only one match"); + return retVal.get(0); + } + } + + public void removeExtension(String theUrl) { + for (int i = getModifierExtension().size()-1; i >= 0; i--) { + if (theUrl.equals(getExtension().get(i).getUrl())) + getExtension().remove(i); + } + super.removeExtension(theUrl); + } + + + /** + * Returns an unmodifiable list containing all extensions on this element which + * match the given URL. + * + * @param theUrl The URL. Must not be blank or null. + * @return an unmodifiable list containing all extensions on this element which + * match the given URL + */ + public List getExtensionsByUrl(String theUrl) { + org.apache.commons.lang3.Validate.notBlank(theUrl, "theUrl must not be blank or null"); + ArrayList retVal = new ArrayList(); + retVal.addAll(super.getExtensionsByUrl(theUrl)); + for (Extension next : getModifierExtension()) { + if (theUrl.equals(next.getUrl())) { + retVal.add(next); + } + } + return java.util.Collections.unmodifiableList(retVal); + } + + public boolean hasExtension(String theUrl) { + return !getExtensionsByUrl(theUrl).isEmpty(); + } + + + public String getExtensionString(String theUrl) throws FHIRException { + List ext = getExtensionsByUrl(theUrl); + if (ext.isEmpty()) + return null; + if (ext.size() > 1) + throw new FHIRException("Multiple matching extensions found"); + if (!ext.get(0).getValue().isPrimitive()) + throw new FHIRException("Extension could not be converted to a string"); + return ext.get(0).getValue().primitiveValue(); + } + // end addition } \ No newline at end of file From cfe386e14192e36bdf9aea2ca8cb8d618c997a7e Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Wed, 10 Jun 2020 09:45:27 +1000 Subject: [PATCH 2/6] clarify --- .../hl7/fhir/r5/model/BackboneElement.java | 427 +++++++++--------- 1 file changed, 207 insertions(+), 220 deletions(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneElement.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneElement.java index 74c7029e8..c763b94c4 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneElement.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneElement.java @@ -6,19 +6,19 @@ package org.hl7.fhir.r5.model; /* Copyright (c) 2011+, HL7, Inc. All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, \ are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this \ + + * Redistributions of source code must retain the above copyright notice, this \ list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, \ + * Redistributions in binary form must reproduce the above copyright notice, \ this list of conditions and the following disclaimer in the documentation \ and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to + * Neither the name of HL7 nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND \ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED \ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. \ @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) \ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE \ POSSIBILITY OF SUCH DAMAGE. - */ + */ // Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent @@ -49,196 +49,196 @@ import ca.uhn.fhir.model.api.annotation.Description; @DatatypeDef(name="BackboneElement") public abstract class BackboneElement extends Element implements IBaseBackboneElement { - /** - * May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions. + /** + * May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions. Modifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself). - */ - @Child(name = "modifierExtension", type = {Extension.class}, order=0, min=0, max=Child.MAX_UNLIMITED, modifier=true, summary=true) - @Description(shortDefinition="Extensions that cannot be ignored even if unrecognized", formalDefinition="May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions.\n\nModifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself)." ) - protected List modifierExtension; + */ + @Child(name = "modifierExtension", type = {Extension.class}, order=0, min=0, max=Child.MAX_UNLIMITED, modifier=true, summary=true) + @Description(shortDefinition="Extensions that cannot be ignored even if unrecognized", formalDefinition="May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions.\n\nModifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself)." ) + protected List modifierExtension; - private static final long serialVersionUID = -1431673179L; + private static final long serialVersionUID = -1431673179L; /** * Constructor */ - public BackboneElement() { - super(); - } + public BackboneElement() { + super(); + } - /** - * @return {@link #modifierExtension} (May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions. + /** + * @return {@link #modifierExtension} (May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions. Modifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself).) - */ - public List getModifierExtension() { - if (this.modifierExtension == null) - this.modifierExtension = new ArrayList(); - return this.modifierExtension; - } + */ + public List getModifierExtension() { + if (this.modifierExtension == null) + this.modifierExtension = new ArrayList(); + return this.modifierExtension; + } - /** - * @return Returns a reference to this for easy method chaining - */ - public BackboneElement setModifierExtension(List theModifierExtension) { - this.modifierExtension = theModifierExtension; - return this; - } + /** + * @return Returns a reference to this for easy method chaining + */ + public BackboneElement setModifierExtension(List theModifierExtension) { + this.modifierExtension = theModifierExtension; + return this; + } - public boolean hasModifierExtension() { - if (this.modifierExtension == null) - return false; - for (Extension item : this.modifierExtension) - if (!item.isEmpty()) - return true; + public boolean hasModifierExtension() { + if (this.modifierExtension == null) return false; - } + for (Extension item : this.modifierExtension) + if (!item.isEmpty()) + return true; + return false; + } - public Extension addModifierExtension() { //3 - Extension t = new Extension(); - if (this.modifierExtension == null) - this.modifierExtension = new ArrayList(); - this.modifierExtension.add(t); - return t; - } + public Extension addModifierExtension() { //3 + Extension t = new Extension(); + if (this.modifierExtension == null) + this.modifierExtension = new ArrayList(); + this.modifierExtension.add(t); + return t; + } - public BackboneElement addModifierExtension(Extension t) { //3 - if (t == null) - return this; - if (this.modifierExtension == null) - this.modifierExtension = new ArrayList(); - this.modifierExtension.add(t); + public BackboneElement addModifierExtension(Extension t) { //3 + if (t == null) return this; + if (this.modifierExtension == null) + this.modifierExtension = new ArrayList(); + this.modifierExtension.add(t); + return this; + } + + /** + * @return The first repetition of repeating field {@link #modifierExtension}, creating it if it does not already exist {3} + */ + public Extension getModifierExtensionFirstRep() { + if (getModifierExtension().isEmpty()) { + addModifierExtension(); + } + return getModifierExtension().get(0); + } + + protected void listChildren(List children) { + super.listChildren(children); + children.add(new Property("modifierExtension", "Extension", "May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions.\n\nModifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself).", 0, java.lang.Integer.MAX_VALUE, modifierExtension)); + } + + @Override + public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { + switch (_hash) { + case -298878168: /*modifierExtension*/ return new Property("modifierExtension", "Extension", "May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions.\n\nModifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself).", 0, java.lang.Integer.MAX_VALUE, modifierExtension); + default: return super.getNamedProperty(_hash, _name, _checkValid); } - /** - * @return The first repetition of repeating field {@link #modifierExtension}, creating it if it does not already exist {3} - */ - public Extension getModifierExtensionFirstRep() { - if (getModifierExtension().isEmpty()) { - addModifierExtension(); - } - return getModifierExtension().get(0); + } + + @Override + public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { + switch (hash) { + case -298878168: /*modifierExtension*/ return this.modifierExtension == null ? new Base[0] : this.modifierExtension.toArray(new Base[this.modifierExtension.size()]); // Extension + default: return super.getProperty(hash, name, checkValid); } - protected void listChildren(List children) { - super.listChildren(children); - children.add(new Property("modifierExtension", "Extension", "May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions.\n\nModifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself).", 0, java.lang.Integer.MAX_VALUE, modifierExtension)); - } + } - @Override - public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { - switch (_hash) { - case -298878168: /*modifierExtension*/ return new Property("modifierExtension", "Extension", "May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions.\n\nModifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself).", 0, java.lang.Integer.MAX_VALUE, modifierExtension); - default: return super.getNamedProperty(_hash, _name, _checkValid); - } + @Override + public Base setProperty(int hash, String name, Base value) throws FHIRException { + switch (hash) { + case -298878168: // modifierExtension + this.getModifierExtension().add(TypeConvertor.castToExtension(value)); // Extension + return value; + default: return super.setProperty(hash, name, value); + } - } + } - @Override - public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { - switch (hash) { - case -298878168: /*modifierExtension*/ return this.modifierExtension == null ? new Base[0] : this.modifierExtension.toArray(new Base[this.modifierExtension.size()]); // Extension - default: return super.getProperty(hash, name, checkValid); - } + @Override + public Base setProperty(String name, Base value) throws FHIRException { + if (name.equals("modifierExtension")) { + this.getModifierExtension().add(TypeConvertor.castToExtension(value)); + } else + return super.setProperty(name, value); + return value; + } - } + @Override + public Base makeProperty(int hash, String name) throws FHIRException { + switch (hash) { + case -298878168: return addModifierExtension(); + default: return super.makeProperty(hash, name); + } - @Override - public Base setProperty(int hash, String name, Base value) throws FHIRException { - switch (hash) { - case -298878168: // modifierExtension - this.getModifierExtension().add(TypeConvertor.castToExtension(value)); // Extension - return value; - default: return super.setProperty(hash, name, value); - } + } - } + @Override + public String[] getTypesForProperty(int hash, String name) throws FHIRException { + switch (hash) { + case -298878168: /*modifierExtension*/ return new String[] {"Extension"}; + default: return super.getTypesForProperty(hash, name); + } - @Override - public Base setProperty(String name, Base value) throws FHIRException { - if (name.equals("modifierExtension")) { - this.getModifierExtension().add(TypeConvertor.castToExtension(value)); - } else - return super.setProperty(name, value); - return value; - } + } - @Override - public Base makeProperty(int hash, String name) throws FHIRException { - switch (hash) { - case -298878168: return addModifierExtension(); - default: return super.makeProperty(hash, name); - } - - } - - @Override - public String[] getTypesForProperty(int hash, String name) throws FHIRException { - switch (hash) { - case -298878168: /*modifierExtension*/ return new String[] {"Extension"}; - default: return super.getTypesForProperty(hash, name); - } - - } - - @Override - public Base addChild(String name) throws FHIRException { - if (name.equals("modifierExtension")) { - return addModifierExtension(); - } - else - return super.addChild(name); - } + @Override + public Base addChild(String name) throws FHIRException { + if (name.equals("modifierExtension")) { + return addModifierExtension(); + } + else + return super.addChild(name); + } public String fhirType() { return "BackboneElement"; } - public abstract BackboneElement copy(); + public abstract BackboneElement copy(); - public void copyValues(BackboneElement dst) { - super.copyValues(dst); - if (modifierExtension != null) { - dst.modifierExtension = new ArrayList(); - for (Extension i : modifierExtension) - dst.modifierExtension.add(i.copy()); - }; - } + public void copyValues(BackboneElement dst) { + super.copyValues(dst); + if (modifierExtension != null) { + dst.modifierExtension = new ArrayList(); + for (Extension i : modifierExtension) + dst.modifierExtension.add(i.copy()); + }; + } - @Override - public boolean equalsDeep(Base other_) { - if (!super.equalsDeep(other_)) - return false; - if (!(other_ instanceof BackboneElement)) - return false; - BackboneElement o = (BackboneElement) other_; - return compareDeep(modifierExtension, o.modifierExtension, true); - } + @Override + public boolean equalsDeep(Base other_) { + if (!super.equalsDeep(other_)) + return false; + if (!(other_ instanceof BackboneElement)) + return false; + BackboneElement o = (BackboneElement) other_; + return compareDeep(modifierExtension, o.modifierExtension, true); + } - @Override - public boolean equalsShallow(Base other_) { - if (!super.equalsShallow(other_)) - return false; - if (!(other_ instanceof BackboneElement)) - return false; - BackboneElement o = (BackboneElement) other_; - return true; - } + @Override + public boolean equalsShallow(Base other_) { + if (!super.equalsShallow(other_)) + return false; + if (!(other_ instanceof BackboneElement)) + return false; + BackboneElement o = (BackboneElement) other_; + return true; + } - public boolean isEmpty() { - return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(modifierExtension); - } + public boolean isEmpty() { + return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(modifierExtension); + } -// Manual code (from Configuration.txt)t: + // Manual code (from Configuration.txt)t: public void checkNoModifiers(String noun, String verb) throws FHIRException { - if (hasModifierExtension()) { - throw new FHIRException("Found unknown Modifier Exceptions on "+noun+" doing "+verb); - } - + if (hasModifierExtension()) { + throw new FHIRException("Found unknown Modifier Exceptions on "+noun+" doing "+verb); + } + } public void addModifierExtension(String url, DataType value) { @@ -251,71 +251,58 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or } - public Extension getExtensionByUrl(String theUrl) { - org.apache.commons.lang3.Validate.notBlank(theUrl, "theUrl must not be blank or null"); - ArrayList retVal = new ArrayList(); - Extension res = super.getExtensionByUrl(theUrl); - if (res != null) { - retVal.add(res); - } - for (Extension next : getModifierExtension()) { - if (theUrl.equals(next.getUrl())) { - retVal.add(next); - } - } - if (retVal.size() == 0) - return null; - else { - org.apache.commons.lang3.Validate.isTrue(retVal.size() == 1, "Url "+theUrl+" must have only one match"); - return retVal.get(0); - } - } - - public void removeExtension(String theUrl) { - for (int i = getModifierExtension().size()-1; i >= 0; i--) { - if (theUrl.equals(getExtension().get(i).getUrl())) - getExtension().remove(i); - } - super.removeExtension(theUrl); - } - - - /** - * Returns an unmodifiable list containing all extensions on this element which - * match the given URL. - * - * @param theUrl The URL. Must not be blank or null. - * @return an unmodifiable list containing all extensions on this element which - * match the given URL - */ - public List getExtensionsByUrl(String theUrl) { - org.apache.commons.lang3.Validate.notBlank(theUrl, "theUrl must not be blank or null"); - ArrayList retVal = new ArrayList(); - retVal.addAll(super.getExtensionsByUrl(theUrl)); - for (Extension next : getModifierExtension()) { - if (theUrl.equals(next.getUrl())) { - retVal.add(next); - } - } - return java.util.Collections.unmodifiableList(retVal); - } - - public boolean hasExtension(String theUrl) { - return !getExtensionsByUrl(theUrl).isEmpty(); - } - - - public String getExtensionString(String theUrl) throws FHIRException { - List ext = getExtensionsByUrl(theUrl); - if (ext.isEmpty()) - return null; - if (ext.size() > 1) - throw new FHIRException("Multiple matching extensions found"); - if (!ext.get(0).getValue().isPrimitive()) - throw new FHIRException("Extension could not be converted to a string"); - return ext.get(0).getValue().primitiveValue(); + @Override + public Extension getExtensionByUrl(String theUrl) { + org.apache.commons.lang3.Validate.notBlank(theUrl, "theUrl must not be blank or null"); + ArrayList retVal = new ArrayList(); + Extension res = super.getExtensionByUrl(theUrl); + if (res != null) { + retVal.add(res); + } + for (Extension next : getModifierExtension()) { + if (theUrl.equals(next.getUrl())) { + retVal.add(next); + } + } + if (retVal.size() == 0) + return null; + else { + org.apache.commons.lang3.Validate.isTrue(retVal.size() == 1, "Url "+theUrl+" must have only one match"); + return retVal.get(0); + } } -// end addition + @Override + public void removeExtension(String theUrl) { + for (int i = getModifierExtension().size()-1; i >= 0; i--) { + if (theUrl.equals(getExtension().get(i).getUrl())) + getExtension().remove(i); + } + super.removeExtension(theUrl); + } + + + /** + * Returns an unmodifiable list containing all extensions on this element which + * match the given URL. + * + * @param theUrl The URL. Must not be blank or null. + * @return an unmodifiable list containing all extensions on this element which + * match the given URL + */ + @Override + public List getExtensionsByUrl(String theUrl) { + org.apache.commons.lang3.Validate.notBlank(theUrl, "theUrl must not be blank or null"); + ArrayList retVal = new ArrayList(); + retVal.addAll(super.getExtensionsByUrl(theUrl)); + for (Extension next : getModifierExtension()) { + if (theUrl.equals(next.getUrl())) { + retVal.add(next); + } + } + return java.util.Collections.unmodifiableList(retVal); + } + + // end addition } \ No newline at end of file From 0c9375aa5b28860332d8478b6a9eecaa7fbfb6a0 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Wed, 10 Jun 2020 09:47:12 +1000 Subject: [PATCH 3/6] fix whitespace --- .../hl7/fhir/r5/model/BackboneElement.java | 428 +++++++++--------- 1 file changed, 214 insertions(+), 214 deletions(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneElement.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneElement.java index c763b94c4..7dd11ef42 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneElement.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneElement.java @@ -6,19 +6,19 @@ package org.hl7.fhir.r5.model; /* Copyright (c) 2011+, HL7, Inc. All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, \ are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this \ + + * Redistributions of source code must retain the above copyright notice, this \ list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, \ + * Redistributions in binary form must reproduce the above copyright notice, \ this list of conditions and the following disclaimer in the documentation \ and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to + * Neither the name of HL7 nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND \ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED \ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. \ @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) \ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE \ POSSIBILITY OF SUCH DAMAGE. - */ + */ // Generated on Mon, May 11, 2020 09:58+1000 for FHIR vcurrent @@ -49,198 +49,198 @@ import ca.uhn.fhir.model.api.annotation.Description; @DatatypeDef(name="BackboneElement") public abstract class BackboneElement extends Element implements IBaseBackboneElement { - /** - * May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions. + /** + * May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions. Modifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself). - */ - @Child(name = "modifierExtension", type = {Extension.class}, order=0, min=0, max=Child.MAX_UNLIMITED, modifier=true, summary=true) - @Description(shortDefinition="Extensions that cannot be ignored even if unrecognized", formalDefinition="May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions.\n\nModifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself)." ) - protected List modifierExtension; + */ + @Child(name = "modifierExtension", type = {Extension.class}, order=0, min=0, max=Child.MAX_UNLIMITED, modifier=true, summary=true) + @Description(shortDefinition="Extensions that cannot be ignored even if unrecognized", formalDefinition="May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions.\n\nModifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself)." ) + protected List modifierExtension; - private static final long serialVersionUID = -1431673179L; + private static final long serialVersionUID = -1431673179L; /** * Constructor */ - public BackboneElement() { - super(); - } + public BackboneElement() { + super(); + } - /** - * @return {@link #modifierExtension} (May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions. + /** + * @return {@link #modifierExtension} (May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions. Modifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself).) - */ - public List getModifierExtension() { - if (this.modifierExtension == null) - this.modifierExtension = new ArrayList(); - return this.modifierExtension; - } + */ + public List getModifierExtension() { + if (this.modifierExtension == null) + this.modifierExtension = new ArrayList(); + return this.modifierExtension; + } - /** - * @return Returns a reference to this for easy method chaining - */ - public BackboneElement setModifierExtension(List theModifierExtension) { - this.modifierExtension = theModifierExtension; - return this; - } - - public boolean hasModifierExtension() { - if (this.modifierExtension == null) - return false; - for (Extension item : this.modifierExtension) - if (!item.isEmpty()) - return true; - return false; - } - - public Extension addModifierExtension() { //3 - Extension t = new Extension(); - if (this.modifierExtension == null) - this.modifierExtension = new ArrayList(); - this.modifierExtension.add(t); - return t; - } - - public BackboneElement addModifierExtension(Extension t) { //3 - if (t == null) + /** + * @return Returns a reference to this for easy method chaining + */ + public BackboneElement setModifierExtension(List theModifierExtension) { + this.modifierExtension = theModifierExtension; return this; - if (this.modifierExtension == null) - this.modifierExtension = new ArrayList(); - this.modifierExtension.add(t); - return this; - } - - /** - * @return The first repetition of repeating field {@link #modifierExtension}, creating it if it does not already exist {3} - */ - public Extension getModifierExtensionFirstRep() { - if (getModifierExtension().isEmpty()) { - addModifierExtension(); - } - return getModifierExtension().get(0); - } - - protected void listChildren(List children) { - super.listChildren(children); - children.add(new Property("modifierExtension", "Extension", "May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions.\n\nModifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself).", 0, java.lang.Integer.MAX_VALUE, modifierExtension)); - } - - @Override - public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { - switch (_hash) { - case -298878168: /*modifierExtension*/ return new Property("modifierExtension", "Extension", "May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions.\n\nModifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself).", 0, java.lang.Integer.MAX_VALUE, modifierExtension); - default: return super.getNamedProperty(_hash, _name, _checkValid); } - } - - @Override - public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { - switch (hash) { - case -298878168: /*modifierExtension*/ return this.modifierExtension == null ? new Base[0] : this.modifierExtension.toArray(new Base[this.modifierExtension.size()]); // Extension - default: return super.getProperty(hash, name, checkValid); + public boolean hasModifierExtension() { + if (this.modifierExtension == null) + return false; + for (Extension item : this.modifierExtension) + if (!item.isEmpty()) + return true; + return false; } - } - - @Override - public Base setProperty(int hash, String name, Base value) throws FHIRException { - switch (hash) { - case -298878168: // modifierExtension - this.getModifierExtension().add(TypeConvertor.castToExtension(value)); // Extension - return value; - default: return super.setProperty(hash, name, value); + public Extension addModifierExtension() { //3 + Extension t = new Extension(); + if (this.modifierExtension == null) + this.modifierExtension = new ArrayList(); + this.modifierExtension.add(t); + return t; } - } - - @Override - public Base setProperty(String name, Base value) throws FHIRException { - if (name.equals("modifierExtension")) { - this.getModifierExtension().add(TypeConvertor.castToExtension(value)); - } else - return super.setProperty(name, value); - return value; - } - - @Override - public Base makeProperty(int hash, String name) throws FHIRException { - switch (hash) { - case -298878168: return addModifierExtension(); - default: return super.makeProperty(hash, name); + public BackboneElement addModifierExtension(Extension t) { //3 + if (t == null) + return this; + if (this.modifierExtension == null) + this.modifierExtension = new ArrayList(); + this.modifierExtension.add(t); + return this; } - } - - @Override - public String[] getTypesForProperty(int hash, String name) throws FHIRException { - switch (hash) { - case -298878168: /*modifierExtension*/ return new String[] {"Extension"}; - default: return super.getTypesForProperty(hash, name); + /** + * @return The first repetition of repeating field {@link #modifierExtension}, creating it if it does not already exist {3} + */ + public Extension getModifierExtensionFirstRep() { + if (getModifierExtension().isEmpty()) { + addModifierExtension(); + } + return getModifierExtension().get(0); } - } + protected void listChildren(List children) { + super.listChildren(children); + children.add(new Property("modifierExtension", "Extension", "May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions.\n\nModifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself).", 0, java.lang.Integer.MAX_VALUE, modifierExtension)); + } - @Override - public Base addChild(String name) throws FHIRException { - if (name.equals("modifierExtension")) { - return addModifierExtension(); - } - else - return super.addChild(name); - } + @Override + public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException { + switch (_hash) { + case -298878168: /*modifierExtension*/ return new Property("modifierExtension", "Extension", "May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions.\n\nModifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself).", 0, java.lang.Integer.MAX_VALUE, modifierExtension); + default: return super.getNamedProperty(_hash, _name, _checkValid); + } + + } + + @Override + public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException { + switch (hash) { + case -298878168: /*modifierExtension*/ return this.modifierExtension == null ? new Base[0] : this.modifierExtension.toArray(new Base[this.modifierExtension.size()]); // Extension + default: return super.getProperty(hash, name, checkValid); + } + + } + + @Override + public Base setProperty(int hash, String name, Base value) throws FHIRException { + switch (hash) { + case -298878168: // modifierExtension + this.getModifierExtension().add(TypeConvertor.castToExtension(value)); // Extension + return value; + default: return super.setProperty(hash, name, value); + } + + } + + @Override + public Base setProperty(String name, Base value) throws FHIRException { + if (name.equals("modifierExtension")) { + this.getModifierExtension().add(TypeConvertor.castToExtension(value)); + } else + return super.setProperty(name, value); + return value; + } + + @Override + public Base makeProperty(int hash, String name) throws FHIRException { + switch (hash) { + case -298878168: return addModifierExtension(); + default: return super.makeProperty(hash, name); + } + + } + + @Override + public String[] getTypesForProperty(int hash, String name) throws FHIRException { + switch (hash) { + case -298878168: /*modifierExtension*/ return new String[] {"Extension"}; + default: return super.getTypesForProperty(hash, name); + } + + } + + @Override + public Base addChild(String name) throws FHIRException { + if (name.equals("modifierExtension")) { + return addModifierExtension(); + } + else + return super.addChild(name); + } public String fhirType() { return "BackboneElement"; } - public abstract BackboneElement copy(); + public abstract BackboneElement copy(); - public void copyValues(BackboneElement dst) { - super.copyValues(dst); - if (modifierExtension != null) { - dst.modifierExtension = new ArrayList(); - for (Extension i : modifierExtension) - dst.modifierExtension.add(i.copy()); - }; - } + public void copyValues(BackboneElement dst) { + super.copyValues(dst); + if (modifierExtension != null) { + dst.modifierExtension = new ArrayList(); + for (Extension i : modifierExtension) + dst.modifierExtension.add(i.copy()); + }; + } - @Override - public boolean equalsDeep(Base other_) { - if (!super.equalsDeep(other_)) - return false; - if (!(other_ instanceof BackboneElement)) - return false; - BackboneElement o = (BackboneElement) other_; - return compareDeep(modifierExtension, o.modifierExtension, true); - } + @Override + public boolean equalsDeep(Base other_) { + if (!super.equalsDeep(other_)) + return false; + if (!(other_ instanceof BackboneElement)) + return false; + BackboneElement o = (BackboneElement) other_; + return compareDeep(modifierExtension, o.modifierExtension, true); + } - @Override - public boolean equalsShallow(Base other_) { - if (!super.equalsShallow(other_)) - return false; - if (!(other_ instanceof BackboneElement)) - return false; - BackboneElement o = (BackboneElement) other_; - return true; - } + @Override + public boolean equalsShallow(Base other_) { + if (!super.equalsShallow(other_)) + return false; + if (!(other_ instanceof BackboneElement)) + return false; + BackboneElement o = (BackboneElement) other_; + return true; + } - public boolean isEmpty() { - return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(modifierExtension); - } + public boolean isEmpty() { + return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(modifierExtension); + } - // Manual code (from Configuration.txt)t: +// Manual code (from Configuration.txt)t: public void checkNoModifiers(String noun, String verb) throws FHIRException { - if (hasModifierExtension()) { - throw new FHIRException("Found unknown Modifier Exceptions on "+noun+" doing "+verb); - } - + if (hasModifierExtension()) { + throw new FHIRException("Found unknown Modifier Exceptions on "+noun+" doing "+verb); + } + } - + public void addModifierExtension(String url, DataType value) { if (isDisallowExtensions()) throw new Error("Extensions are not allowed in this context"); @@ -251,58 +251,58 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or } - @Override - public Extension getExtensionByUrl(String theUrl) { - org.apache.commons.lang3.Validate.notBlank(theUrl, "theUrl must not be blank or null"); - ArrayList retVal = new ArrayList(); - Extension res = super.getExtensionByUrl(theUrl); - if (res != null) { - retVal.add(res); - } - for (Extension next : getModifierExtension()) { - if (theUrl.equals(next.getUrl())) { - retVal.add(next); - } - } - if (retVal.size() == 0) - return null; - else { - org.apache.commons.lang3.Validate.isTrue(retVal.size() == 1, "Url "+theUrl+" must have only one match"); - return retVal.get(0); - } - } + @Override + public Extension getExtensionByUrl(String theUrl) { + org.apache.commons.lang3.Validate.notBlank(theUrl, "theUrl must not be blank or null"); + ArrayList retVal = new ArrayList(); + Extension res = super.getExtensionByUrl(theUrl); + if (res != null) { + retVal.add(res); + } + for (Extension next : getModifierExtension()) { + if (theUrl.equals(next.getUrl())) { + retVal.add(next); + } + } + if (retVal.size() == 0) + return null; + else { + org.apache.commons.lang3.Validate.isTrue(retVal.size() == 1, "Url "+theUrl+" must have only one match"); + return retVal.get(0); + } + } + + @Override + public void removeExtension(String theUrl) { + for (int i = getModifierExtension().size()-1; i >= 0; i--) { + if (theUrl.equals(getExtension().get(i).getUrl())) + getExtension().remove(i); + } + super.removeExtension(theUrl); + } + - @Override - public void removeExtension(String theUrl) { - for (int i = getModifierExtension().size()-1; i >= 0; i--) { - if (theUrl.equals(getExtension().get(i).getUrl())) - getExtension().remove(i); - } - super.removeExtension(theUrl); - } - - - /** - * Returns an unmodifiable list containing all extensions on this element which - * match the given URL. - * - * @param theUrl The URL. Must not be blank or null. - * @return an unmodifiable list containing all extensions on this element which - * match the given URL - */ - @Override - public List getExtensionsByUrl(String theUrl) { - org.apache.commons.lang3.Validate.notBlank(theUrl, "theUrl must not be blank or null"); - ArrayList retVal = new ArrayList(); - retVal.addAll(super.getExtensionsByUrl(theUrl)); - for (Extension next : getModifierExtension()) { - if (theUrl.equals(next.getUrl())) { - retVal.add(next); - } - } - return java.util.Collections.unmodifiableList(retVal); - } - - // end addition + /** + * Returns an unmodifiable list containing all extensions on this element which + * match the given URL. + * + * @param theUrl The URL. Must not be blank or null. + * @return an unmodifiable list containing all extensions on this element which + * match the given URL + */ + @Override + public List getExtensionsByUrl(String theUrl) { + org.apache.commons.lang3.Validate.notBlank(theUrl, "theUrl must not be blank or null"); + ArrayList retVal = new ArrayList(); + retVal.addAll(super.getExtensionsByUrl(theUrl)); + for (Extension next : getModifierExtension()) { + if (theUrl.equals(next.getUrl())) { + retVal.add(next); + } + } + return java.util.Collections.unmodifiableList(retVal); + } + +// end addition } \ No newline at end of file From 5efaee2c47a17b1e8256465373de52d2d5e9f832 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Wed, 10 Jun 2020 12:16:54 +1000 Subject: [PATCH 4/6] add javadoc around extension mgmt --- .../java/org/hl7/fhir/r5/model/Element.java | 37 +++++++++++++++++-- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Element.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Element.java index 36c2ace35..21f082ba0 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Element.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Element.java @@ -319,7 +319,15 @@ public abstract class Element extends Base implements IBaseHasExtensions, IBaseE getExtension().add(ex); } - + + /** + * Returns an extension if one (and only one) matches the given URL. + * + * Note: BackbdoneElements override this to look in matching Modifier Extensions too + * + * @param theUrl The URL. Must not be blank or null. + * @return the matching extension, or null + */ public Extension getExtensionByUrl(String theUrl) { org.apache.commons.lang3.Validate.notBlank(theUrl, "theUrl must not be blank or null"); ArrayList retVal = new ArrayList(); @@ -336,6 +344,13 @@ public abstract class Element extends Base implements IBaseHasExtensions, IBaseE } } + /** + * Remove any extensions that match (by given URL). + * + * Note: BackbdoneElements override this to remove from Modifier Extensions too + * + * @param theUrl The URL. Must not be blank or null. + */ public void removeExtension(String theUrl) { for (int i = getExtension().size()-1; i >= 0; i--) { if (theUrl.equals(getExtension().get(i).getUrl())) @@ -367,9 +382,10 @@ public abstract class Element extends Base implements IBaseHasExtensions, IBaseE * Returns an unmodifiable list containing all extensions on this element which * match the given URL. * + * Note: BackbdoneElements override this to add matching Modifier Extensions too + * * @param theUrl The URL. Must not be blank or null. - * @return an unmodifiable list containing all extensions on this element which - * match the given URL + * @return an unmodifiable list containing all extensions on this element which match the given URL */ public List getExtensionsByUrl(String theUrl) { org.apache.commons.lang3.Validate.notBlank(theUrl, "theUrl must not be blank or null"); @@ -382,11 +398,24 @@ public abstract class Element extends Base implements IBaseHasExtensions, IBaseE return java.util.Collections.unmodifiableList(retVal); } + /** + * Returns an true if this element has an extension that matchs the given URL. + * + * Note: BackbdoneElements override this to check Modifier Extensions too + * + * @param theUrl The URL. Must not be blank or null. + */ public boolean hasExtension(String theUrl) { return !getExtensionsByUrl(theUrl).isEmpty(); } - + /** + * Returns the value as a string if this element has only one extension that matches the given URL, and that can be converted to a string. + * + * Note: BackbdoneElements override this to check Modifier Extensions too + * + * @param theUrl The URL. Must not be blank or null. + */ public String getExtensionString(String theUrl) throws FHIRException { List ext = getExtensionsByUrl(theUrl); if (ext.isEmpty()) From a09c4c3cea128e5c3fbfee7f2a6ea5ade2beecdd Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Thu, 11 Jun 2020 16:40:20 +1000 Subject: [PATCH 5/6] fix NPE in IG publisher --- .../main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java index 51787fb5c..9e26d2305 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java @@ -609,6 +609,10 @@ public abstract class BaseWorkerContext extends I18nBase implements IWorkerConte public ValidationResult validateCode(ValidationOptions options, Coding code, ValueSet vs) { assert options != null; + if (options == null) { + options = ValidationOptions.defaults(); + } + CacheToken cacheToken = txCache != null ? txCache.generateValidationToken(options, code, vs) : null; ValidationResult res = null; if (txCache != null) From 5f1d6e193c47b504457d833cfaa4fda92153ed2a Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Thu, 11 Jun 2020 16:40:57 +1000 Subject: [PATCH 6/6] first release of functional Profile comparison on new framework --- .../r5/comparison/CodeSystemComparer.java | 5 + .../r5/comparison/ComparisonRenderer.java | 30 +- .../fhir/r5/comparison/ComparisonSession.java | 16 +- .../r5/comparison/OldProfileComparer.java | 1650 ----------------- .../fhir/r5/comparison/ProfileComparer.java | 211 ++- .../fhir/r5/comparison/ResourceComparer.java | 5 +- .../fhir/r5/comparison/StructuralMatch.java | 10 + .../fhir/r5/comparison/ValueSetComparer.java | 7 +- .../fhir/r5/conformance/ProfileUtilities.java | 175 +- .../fhir/r5/utils/DefinitionNavigator.java | 5 + .../xhtml/HierarchicalTableGenerator.java | 24 + .../comparison/tests/ComparisonTests.java | 28 +- 12 files changed, 412 insertions(+), 1754 deletions(-) delete mode 100644 org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/OldProfileComparer.java diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/CodeSystemComparer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/CodeSystemComparer.java index d44ae92b4..03aa439de 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/CodeSystemComparer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/CodeSystemComparer.java @@ -50,6 +50,11 @@ public class CodeSystemComparer extends CanonicalResourceComparer { protected String abbreviation() { return "cs"; } + + @Override + protected String summary() { + return "CodeSystem: "+left.present()+" vs "+right.present(); + } } private CodeSystem right; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/ComparisonRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/ComparisonRenderer.java index 3d6867624..870376f7c 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/ComparisonRenderer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/ComparisonRenderer.java @@ -2,9 +2,12 @@ package org.hl7.fhir.r5.comparison; import java.io.FileOutputStream; import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.exceptions.PathEngineException; @@ -12,6 +15,7 @@ import org.hl7.fhir.r5.comparison.CodeSystemComparer.CodeSystemComparison; import org.hl7.fhir.r5.comparison.ProfileComparer.ProfileComparison; import org.hl7.fhir.r5.comparison.ResourceComparer.ResourceComparison; import org.hl7.fhir.r5.comparison.ValueSetComparer.ValueSetComparison; +import org.hl7.fhir.r5.conformance.ProfileUtilities; import org.hl7.fhir.r5.context.IWorkerContext; import org.hl7.fhir.r5.formats.IParser.OutputStyle; import org.hl7.fhir.r5.model.Base; @@ -47,9 +51,27 @@ public class ComparisonRenderer implements IEvaluationContext { public void render() throws IOException { dumpBinaries(); - for (String id : session.getCompares().keySet()) { - renderComparison(id, session.getCompares().get(id)); + StringBuilder b = new StringBuilder(); + + for (String id : sorted(session.getCompares().keySet())) { + ResourceComparison comp = session.getCompares().get(id); + renderComparison(id, comp); + b.append("
  • "+Utilities.escapeXml(comp.summary())+"
    • \r\n"); } + Map vars = new HashMap<>(); + CodeSystemComparer cs = new CodeSystemComparer(session); + vars.put("title", new StringType(session.getTitle())); + vars.put("list", new StringType(b.toString())); + String template = templates.get("Index"); + String cnt = processTemplate(template, "CodeSystem", vars); + TextFile.stringToFile(cnt, file("index.html")); + } + + private List sorted(Set keySet) { + List list = new ArrayList<>(); + list.addAll(keySet); + Collections.sort(list); + return list; } private void dumpBinaries() throws IOException { @@ -115,7 +137,7 @@ public class ComparisonRenderer implements IEvaluationContext { private void renderProfile(String id, ProfileComparison comp) throws IOException { String template = templates.get("Profile"); Map vars = new HashMap<>(); - ProfileComparer cs = new ProfileComparer(session); + ProfileComparer cs = new ProfileComparer(session, new ProfileUtilities(session.getContext(), null, null)); vars.put("left", new StringType(comp.getLeft().present())); vars.put("right", new StringType(comp.getRight().present())); vars.put("leftId", new StringType(comp.getLeft().getId())); @@ -124,7 +146,7 @@ public class ComparisonRenderer implements IEvaluationContext { vars.put("rightUrl", new StringType(comp.getRight().getUrl())); vars.put("errors", new StringType(new XhtmlComposer(true).compose(cs.renderErrors(comp)))); vars.put("metadata", new StringType(new XhtmlComposer(true).compose(cs.renderMetadata(comp, "", "")))); -// vars.put("concepts", new StringType(new XhtmlComposer(true).compose(cs.renderConcepts(comp, "", "")))); + vars.put("structure", new StringType(new XhtmlComposer(true).compose(cs.renderStructure(comp, "", "", "http://hl7.org/fhir")))); String cnt = processTemplate(template, "CodeSystem", vars); TextFile.stringToFile(cnt, file(comp.getId()+".html")); new org.hl7.fhir.r5.formats.JsonParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path("[tmp]", "comparison", comp.getId() + "-union.json")), comp.getUnion()); diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/ComparisonSession.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/ComparisonSession.java index 33da2905b..b9799817a 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/ComparisonSession.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/ComparisonSession.java @@ -12,6 +12,7 @@ import org.hl7.fhir.r5.comparison.CodeSystemComparer.CodeSystemComparison; import org.hl7.fhir.r5.comparison.ProfileComparer.ProfileComparison; import org.hl7.fhir.r5.comparison.ResourceComparer.ResourceComparison; import org.hl7.fhir.r5.comparison.ValueSetComparer.ValueSetComparison; +import org.hl7.fhir.r5.conformance.ProfileUtilities; import org.hl7.fhir.r5.context.IWorkerContext; import org.hl7.fhir.r5.model.CanonicalResource; import org.hl7.fhir.r5.model.CodeSystem; @@ -27,17 +28,25 @@ public class ComparisonSession { private String sessiondId; private int count; private boolean debug; + private String title; - public ComparisonSession(IWorkerContext context) { + public ComparisonSession(IWorkerContext context, String title) { super(); this.context = context; this.sessiondId = UUID.randomUUID().toString().toLowerCase(); + this.title = title; } public IWorkerContext getContext() { return context; } + + + public String getTitle() { + return title; + } + public ResourceComparison compare(String left, String right) throws DefinitionException, FHIRFormatError, IOException { CanonicalResource l = (CanonicalResource) context.fetchResource(Resource.class, left); if (l == null) { @@ -69,7 +78,7 @@ public class ComparisonSession { compares.put(key, csc); return csc; } else if (left instanceof StructureDefinition && right instanceof StructureDefinition) { - ProfileComparer cs = new ProfileComparer(this); + ProfileComparer cs = new ProfileComparer(this, new ProfileUtilities(context, null, null)); ProfileComparison csc = cs.compare((StructureDefinition) left, (StructureDefinition) right); compares.put(key, csc); return csc; @@ -91,9 +100,6 @@ public class ComparisonSession { public void identify(ResourceComparison res) { count++; - if (!Utilities.isValidId(res.getId())) { - res.setId(sessiondId+"-"+count); - } } public boolean isDebug() { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/OldProfileComparer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/OldProfileComparer.java deleted file mode 100644 index 4902af3a8..000000000 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/OldProfileComparer.java +++ /dev/null @@ -1,1650 +0,0 @@ -package org.hl7.fhir.r5.comparison; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - - */ - - - -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.net.URLConnection; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import org.hl7.fhir.exceptions.DefinitionException; -import org.hl7.fhir.exceptions.FHIRException; -import org.hl7.fhir.exceptions.FHIRFormatError; -import org.hl7.fhir.r5.conformance.ProfileUtilities; -import org.hl7.fhir.r5.conformance.ProfileUtilities.ProfileKnowledgeProvider; -import org.hl7.fhir.r5.context.IWorkerContext; -import org.hl7.fhir.r5.formats.IParser; -import org.hl7.fhir.r5.model.Base; -import org.hl7.fhir.r5.model.Coding; -import org.hl7.fhir.r5.model.DataType; -import org.hl7.fhir.r5.model.ElementDefinition; -import org.hl7.fhir.r5.model.ElementDefinition.DiscriminatorType; -import org.hl7.fhir.r5.model.ElementDefinition.ElementDefinitionBindingComponent; -import org.hl7.fhir.r5.model.ElementDefinition.ElementDefinitionConstraintComponent; -import org.hl7.fhir.r5.model.ElementDefinition.ElementDefinitionMappingComponent; -import org.hl7.fhir.r5.model.ElementDefinition.ElementDefinitionSlicingComponent; -import org.hl7.fhir.r5.model.ElementDefinition.ElementDefinitionSlicingDiscriminatorComponent; -import org.hl7.fhir.r5.model.ElementDefinition.SlicingRules; -import org.hl7.fhir.r5.model.ElementDefinition.TypeRefComponent; -import org.hl7.fhir.r5.model.Enumerations.BindingStrength; -import org.hl7.fhir.r5.model.Enumerations.PublicationStatus; -import org.hl7.fhir.r5.model.IntegerType; -import org.hl7.fhir.r5.model.PrimitiveType; -import org.hl7.fhir.r5.model.StringType; -import org.hl7.fhir.r5.model.StructureDefinition; -import org.hl7.fhir.r5.model.StructureDefinition.TypeDerivationRule; -import org.hl7.fhir.r5.model.ValueSet; -import org.hl7.fhir.r5.model.ValueSet.ConceptReferenceComponent; -import org.hl7.fhir.r5.model.ValueSet.ConceptSetComponent; -import org.hl7.fhir.r5.model.ValueSet.ValueSetExpansionContainsComponent; -import org.hl7.fhir.r5.renderers.RendererFactory; -import org.hl7.fhir.r5.renderers.utils.RenderingContext; -import org.hl7.fhir.r5.renderers.utils.RenderingContext.ResourceRendererMode; -import org.hl7.fhir.r5.terminologies.ValueSetExpander.ValueSetExpansionOutcome; -import org.hl7.fhir.r5.utils.DefinitionNavigator; -import org.hl7.fhir.r5.utils.EOperationOutcome; -import org.hl7.fhir.r5.utils.KeyGenerator; -import org.hl7.fhir.r5.utils.ToolingExtensions; -import org.hl7.fhir.utilities.CommaSeparatedStringBuilder; -import org.hl7.fhir.utilities.TextFile; -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.utilities.validation.ValidationMessage; -import org.hl7.fhir.utilities.validation.ValidationMessage.IssueSeverity; -import org.hl7.fhir.utilities.validation.ValidationMessage.Source; -import org.hl7.fhir.utilities.xhtml.XhtmlComposer; - -/** - * A engine that generates difference analysis between two sets of structure - * definitions, typically from 2 different implementation guides. - * - * How this class works is that you create it with access to a bunch of underying - * resources that includes all the structure definitions from both implementation - * guides - * - * Once the class is created, you repeatedly pass pairs of structure definitions, - * one from each IG, building up a web of difference analyses. This class will - * automatically process any internal comparisons that it encounters - * - * When all the comparisons have been performed, you can then generate a variety - * of output formats - * - * @author Grahame Grieve - * - */ -public class OldProfileComparer implements ProfileKnowledgeProvider { - - private class ValueSetComparison { - private ValueSet left; - private ValueSet right; - private String error; - } - - - - - - - private IWorkerContext context; - private KeyGenerator keygen; - private String folder; - - public OldProfileComparer(IWorkerContext context, KeyGenerator keygen, String folder) throws IOException { - super(); - this.context = context; - this.keygen = keygen; - this.folder = folder; - for (Entry e : context.getBinaries().entrySet()) { - TextFile.bytesToFile(e.getValue(), Utilities.path(folder, e.getKey())); - } - } - - public OldProfileComparer(IWorkerContext context, String folder) throws IOException { - super(); - this.context = context; - this.folder = folder; - for (Entry e : context.getBinaries().entrySet()) { - TextFile.bytesToFile(e.getValue(), Utilities.path(folder, e.getKey())); - } - } - - private static final int BOTH_NULL = 0; - private static final int EITHER_NULL = 1; - - public class ProfileComparison { - private String id; - /** - * the first of two structures that were compared to generate this comparison - * - * In a few cases - selection of example content and value sets - left gets - * preference over right - */ - private StructureDefinition left; - - /** - * the second of two structures that were compared to generate this comparison - * - * In a few cases - selection of example content and value sets - left gets - * preference over right - */ - private StructureDefinition right; - - - public String getId() { - return id; - } - private String leftName() { - return left.getName(); - } - private String rightName() { - return right.getName(); - } - - /** - * messages generated during the comparison. There are 4 grades of messages: - * information - a list of differences between structures - * warnings - notifies that the comparer is unable to fully compare the structures (constraints differ, open value sets) - * errors - where the structures are incompatible - * fatal errors - some error that prevented full analysis - * - * @return - */ - private List messages = new ArrayList(); - - /** - * The structure that describes all instances that will conform to both structures - */ - private StructureDefinition subset; - - /** - * The structure that describes all instances that will conform to either structures - */ - private StructureDefinition superset; - - public StructureDefinition getLeft() { - return left; - } - - public StructureDefinition getRight() { - return right; - } - - public List getMessages() { - return messages; - } - - public StructureDefinition getSubset() { - return subset; - } - - public StructureDefinition getSuperset() { - return superset; - } - - private boolean ruleEqual(String path, ElementDefinition ed, String vLeft, String vRight, String description, boolean nullOK) { - if (vLeft == null && vRight == null && nullOK) - return true; - if (vLeft == null && vRight == null) { - messages.add(new ValidationMessage(Source.ProfileComparer, ValidationMessage.IssueType.STRUCTURE, path, description+" and not null (null/null)", ValidationMessage.IssueSeverity.ERROR)); - if (ed != null) - status(ed, ProfileUtilities.STATUS_ERROR); - } - if (vLeft == null || !vLeft.equals(vRight)) { - messages.add(new ValidationMessage(Source.ProfileComparer, ValidationMessage.IssueType.STRUCTURE, path, description+" ("+vLeft+"/"+vRight+")", ValidationMessage.IssueSeverity.ERROR)); - if (ed != null) - status(ed, ProfileUtilities.STATUS_ERROR); - } - return true; - } - - private boolean ruleCompares(ElementDefinition ed, DataType vLeft, DataType vRight, String path, int nullStatus) throws IOException { - if (vLeft == null && vRight == null && nullStatus == BOTH_NULL) - return true; - if (vLeft == null && vRight == null) { - messages.add(new ValidationMessage(Source.ProfileComparer, ValidationMessage.IssueType.STRUCTURE, path, "Must be the same and not null (null/null)", ValidationMessage.IssueSeverity.ERROR)); - status(ed, ProfileUtilities.STATUS_ERROR); - } - if (vLeft == null && nullStatus == EITHER_NULL) - return true; - if (vRight == null && nullStatus == EITHER_NULL) - return true; - if (vLeft == null || vRight == null || !Base.compareDeep(vLeft, vRight, false)) { - messages.add(new ValidationMessage(Source.ProfileComparer, ValidationMessage.IssueType.STRUCTURE, path, "Must be the same ("+toString(vLeft)+"/"+toString(vRight)+")", ValidationMessage.IssueSeverity.ERROR)); - status(ed, ProfileUtilities.STATUS_ERROR); - } - return true; - } - - private boolean rule(ElementDefinition ed, boolean test, String path, String message) { - if (!test) { - messages.add(new ValidationMessage(Source.ProfileComparer, ValidationMessage.IssueType.STRUCTURE, path, message, ValidationMessage.IssueSeverity.ERROR)); - status(ed, ProfileUtilities.STATUS_ERROR); - } - return test; - } - - private boolean ruleEqual(ElementDefinition ed, boolean vLeft, boolean vRight, String path, String elementName) { - if (vLeft != vRight) { - messages.add(new ValidationMessage(Source.ProfileComparer, ValidationMessage.IssueType.STRUCTURE, path, elementName+" must be the same ("+vLeft+"/"+vRight+")", ValidationMessage.IssueSeverity.ERROR)); - status(ed, ProfileUtilities.STATUS_ERROR); - } - return true; - } - - private String toString(DataType val) throws IOException { - if (val instanceof PrimitiveType) - return "\"" + ((PrimitiveType) val).getValueAsString()+"\""; - - IParser jp = context.newJsonParser(); - return jp.composeString(val, "value"); - } - - public int getErrorCount() { - int c = 0; - for (ValidationMessage vm : messages) - if (vm.getLevel() == ValidationMessage.IssueSeverity.ERROR) - c++; - return c; - } - - public int getWarningCount() { - int c = 0; - for (ValidationMessage vm : messages) - if (vm.getLevel() == ValidationMessage.IssueSeverity.WARNING) - c++; - return c; - } - - public int getHintCount() { - int c = 0; - for (ValidationMessage vm : messages) - if (vm.getLevel() == ValidationMessage.IssueSeverity.INFORMATION) - c++; - return c; - } - } - - /** - * Value sets used in the subset and superset - */ - private List valuesets = new ArrayList(); - private List comparisons = new ArrayList(); - private String id; - private String title; - private String leftPrefix; - private String rightPrefix; - private String leftLink; - private String leftName; - private String rightLink; - private String rightName; - - - public List getValuesets() { - return valuesets; - } - - public void status(ElementDefinition ed, int value) { - ed.setUserData(ProfileUtilities.UD_ERROR_STATUS, Math.max(value, ed.getUserInt("error-status"))); - } - - public List getComparisons() { - return comparisons; - } - - /** - * Compare left and right structure definitions to see whether they are consistent or not - * - * Note that left and right are arbitrary choices. In one respect, left - * is 'preferred' - the left's example value and data sets will be selected - * over the right ones in the common structure definition - * @throws DefinitionException - * @throws IOException - * @throws FHIRFormatError - * - * @ - */ - public ProfileComparison compareProfiles(StructureDefinition left, StructureDefinition right) throws DefinitionException, IOException, FHIRFormatError { - ProfileComparison outcome = new ProfileComparison(); - outcome.left = left; - outcome.right = right; - - if (left == null) - throw new DefinitionException("No StructureDefinition provided (left)"); - if (right == null) - throw new DefinitionException("No StructureDefinition provided (right)"); - if (!left.hasSnapshot()) - throw new DefinitionException("StructureDefinition has no snapshot (left: "+outcome.leftName()+")"); - if (!right.hasSnapshot()) - throw new DefinitionException("StructureDefinition has no snapshot (right: "+outcome.rightName()+")"); - if (left.getSnapshot().getElement().isEmpty()) - throw new DefinitionException("StructureDefinition snapshot is empty (left: "+outcome.leftName()+")"); - if (right.getSnapshot().getElement().isEmpty()) - throw new DefinitionException("StructureDefinition snapshot is empty (right: "+outcome.rightName()+")"); - - for (ProfileComparison pc : comparisons) - if (pc.left.getUrl().equals(left.getUrl()) && pc.right.getUrl().equals(right.getUrl())) - return pc; - - outcome.id = Integer.toString(comparisons.size()+1); - comparisons.add(outcome); - - DefinitionNavigator ln = new DefinitionNavigator(context, left); - DefinitionNavigator rn = new DefinitionNavigator(context, right); - - // from here on in, any issues go in messages - outcome.superset = new StructureDefinition(); - outcome.subset = new StructureDefinition(); - keygen.genId(outcome.subset); - keygen.genId(outcome.superset); - if (outcome.ruleEqual(ln.path(), null,ln.path(), rn.path(), "Base Type is not compatible", false)) { - if (compareElements(outcome, ln.path(), ln, rn, null)) { - outcome.subset.setName("intersection of "+outcome.leftName()+" and "+outcome.rightName()); - outcome.subset.setStatus(PublicationStatus.DRAFT); - outcome.subset.setKind(outcome.left.getKind()); - outcome.subset.setType(outcome.left.getType()); - outcome.subset.setBaseDefinition("http://hl7.org/fhir/StructureDefinition/"+outcome.subset.getType()); - outcome.subset.setDerivation(TypeDerivationRule.CONSTRAINT); - outcome.subset.setAbstract(false); - outcome.superset.setName("union of "+outcome.leftName()+" and "+outcome.rightName()); - outcome.superset.setStatus(PublicationStatus.DRAFT); - outcome.superset.setKind(outcome.left.getKind()); - outcome.superset.setType(outcome.left.getType()); - outcome.superset.setBaseDefinition("http://hl7.org/fhir/StructureDefinition/"+outcome.subset.getType()); - outcome.superset.setAbstract(false); - outcome.superset.setDerivation(TypeDerivationRule.CONSTRAINT); - } else { - outcome.subset = null; - outcome.superset = null; - } - } - return outcome; - } - - /** - * left and right refer to the same element. Are they compatible? - * @param outcome - * @param outcome - * @param path - * @param left - * @param right - * @- if there's a problem that needs fixing in this code - * @throws DefinitionException - * @throws IOException - * @throws FHIRFormatError - */ - private boolean compareElements(ProfileComparison outcome, String path, DefinitionNavigator left, DefinitionNavigator right, String sliceName) throws DefinitionException, IOException, FHIRFormatError { -// preconditions: - assert(path != null); - assert(left != null); - assert(right != null); - assert(left.path().equals(right.path())); - - // we ignore slicing right now - we're going to clone the root one anyway, and then think about clones - // simple stuff - ElementDefinition subset = new ElementDefinition(); - subset.setPath(left.path()); - if (sliceName != null) - subset.setSliceName(sliceName); - - // not allowed to be different: - subset.getRepresentation().addAll(left.current().getRepresentation()); // can't be bothered even testing this one - if (!outcome.ruleCompares(subset, left.current().getDefaultValue(), right.current().getDefaultValue(), path+".defaultValue[x]", BOTH_NULL)) - return false; - subset.setDefaultValue(left.current().getDefaultValue()); - if (!outcome.ruleEqual(path, subset, left.current().getMeaningWhenMissing(), right.current().getMeaningWhenMissing(), "meaningWhenMissing Must be the same", true)) - return false; - subset.setMeaningWhenMissing(left.current().getMeaningWhenMissing()); - if (!outcome.ruleEqual(subset, left.current().getIsModifier(), right.current().getIsModifier(), path, "isModifier")) - return false; - subset.setIsModifier(left.current().getIsModifier()); - if (!outcome.ruleEqual(subset, left.current().getIsSummary(), right.current().getIsSummary(), path, "isSummary")) - return false; - subset.setIsSummary(left.current().getIsSummary()); - - // descriptive properties from ElementDefinition - merge them: - subset.setLabel(mergeText(subset, outcome, path, "label", left.current().getLabel(), right.current().getLabel())); - subset.setShort(mergeText(subset, outcome, path, "short", left.current().getShort(), right.current().getShort())); - subset.setDefinition(mergeText(subset, outcome, path, "definition", left.current().getDefinition(), right.current().getDefinition())); - subset.setComment(mergeText(subset, outcome, path, "comments", left.current().getComment(), right.current().getComment())); - subset.setRequirements(mergeText(subset, outcome, path, "requirements", left.current().getRequirements(), right.current().getRequirements())); - subset.getCode().addAll(mergeCodings(left.current().getCode(), right.current().getCode())); - subset.getAlias().addAll(mergeStrings(left.current().getAlias(), right.current().getAlias())); - subset.getMapping().addAll(mergeMappings(left.current().getMapping(), right.current().getMapping())); - // left will win for example - subset.setExample(left.current().hasExample() ? left.current().getExample() : right.current().getExample()); - - subset.setMustSupport(left.current().getMustSupport() || right.current().getMustSupport()); - ElementDefinition superset = subset.copy(); - - - // compare and intersect - superset.setMin(unionMin(left.current().getMin(), right.current().getMin())); - superset.setMax(unionMax(left.current().getMax(), right.current().getMax())); - subset.setMin(intersectMin(left.current().getMin(), right.current().getMin())); - subset.setMax(intersectMax(left.current().getMax(), right.current().getMax())); - outcome.rule(subset, subset.getMax().equals("*") || Integer.parseInt(subset.getMax()) >= subset.getMin(), path, "Cardinality Mismatch: "+card(left)+"/"+card(right)); - - superset.getType().addAll(unionTypes(path, left.current().getType(), right.current().getType())); - subset.getType().addAll(intersectTypes(subset, outcome, path, left.current().getType(), right.current().getType())); - outcome.rule(subset, !subset.getType().isEmpty() || (!left.current().hasType() && !right.current().hasType()), path, "Type Mismatch:\r\n "+typeCode(left)+"\r\n "+typeCode(right)); -// -// - superset.setMaxLengthElement(unionMaxLength(left.current().getMaxLength(), right.current().getMaxLength())); - subset.setMaxLengthElement(intersectMaxLength(left.current().getMaxLength(), right.current().getMaxLength())); - if (left.current().hasBinding() || right.current().hasBinding()) { - compareBindings(outcome, subset, superset, path, left.current(), right.current()); - } - - // note these are backwards - superset.getConstraint().addAll(intersectConstraints(path, left.current().getConstraint(), right.current().getConstraint())); - subset.getConstraint().addAll(unionConstraints(subset, outcome, path, left.current().getConstraint(), right.current().getConstraint())); - - // add the children - outcome.subset.getSnapshot().getElement().add(subset); - outcome.superset.getSnapshot().getElement().add(superset); - boolean ret = compareChildren(subset, outcome, path, left, right); - - // now process the slices - if (left.current().hasSlicing() || right.current().hasSlicing()) { - assert sliceName == null; - if (isExtension(left.path())) - return compareExtensions(outcome, path, superset, subset, left, right); -// return true; - else { - ElementDefinitionSlicingComponent slicingL = left.current().getSlicing(); - ElementDefinitionSlicingComponent slicingR = right.current().getSlicing(); - // well, this is tricky. If one is sliced, and the other is not, then in general, the union just ignores the slices, and the intersection is the slices. - if (left.current().hasSlicing() && !right.current().hasSlicing()) { - // the super set is done. Any restrictions in the slices are irrelevant to what the super set says, except that we're going sum up the value sets if we can (for documentation purposes) (todo) - // the minimum set is the slicing specified in the slicer - subset.setSlicing(slicingL); - // stick everything from the right to do with the slices to the subset - copySlices(outcome.subset.getSnapshot().getElement(), left.getStructure().getSnapshot().getElement(), left.slices()); - } else if (!left.current().hasSlicing() && right.current().hasSlicing()) { - // the super set is done. Any restrictions in the slices are irrelevant to what the super set says, except that we're going sum up the value sets if we can (for documentation purposes) (todo) - // the minimum set is the slicing specified in the slicer - subset.setSlicing(slicingR); - // stick everything from the right to do with the slices to the subset - copySlices(outcome.subset.getSnapshot().getElement(), right.getStructure().getSnapshot().getElement(), right.slices()); - } else if (isTypeSlicing(slicingL) || isTypeSlicing(slicingR)) { - superset.getSlicing().setRules(SlicingRules.OPEN).setOrdered(false).addDiscriminator().setType(DiscriminatorType.TYPE).setPath("$this"); - subset.getSlicing().setRules(slicingL.getRules() == SlicingRules.CLOSED || slicingR.getRules() == SlicingRules.CLOSED ? SlicingRules.OPEN : SlicingRules.CLOSED).setOrdered(false).addDiscriminator().setType(DiscriminatorType.TYPE).setPath("$this"); - - // the superset is the union of the types - // the subset is the intersection of them - List handled = new ArrayList<>(); - for (DefinitionNavigator t : left.slices()) { - DefinitionNavigator r = findMatchingSlice(right.slices(), t); - if (r == null) { - copySlice(outcome.superset.getSnapshot().getElement(), left.getStructure().getSnapshot().getElement(), t); - } else { - handled.add(r); - ret = compareElements(outcome, path+":"+t.current().getSliceName(), t, r, t.current().getSliceName()) && ret; - } - } - for (DefinitionNavigator t : right.slices()) { - if (!handled.contains(t)) { - copySlice(outcome.superset.getSnapshot().getElement(), right.getStructure().getSnapshot().getElement(), t); - } - } - } else if (slicingMatches(slicingL, slicingR)) { - // if it's the same, we can try matching the slices - though we might have to give up without getting matches correct - // there amy be implied consistency we can't reason about - throw new DefinitionException("Slicing matches but is not handled yet at "+left.current().getId()+": ("+ProfileUtilities.summarizeSlicing(slicingL)+")"); - } else { - // if the slicing is different, we can't compare them - or can we? - throw new DefinitionException("Slicing doesn't match at "+left.current().getId()+": ("+ProfileUtilities.summarizeSlicing(slicingL)+" / "+ProfileUtilities.summarizeSlicing(slicingR)+")"); - } - } - // todo: name - } - return ret; - } - - - private DefinitionNavigator findMatchingSlice(List slices, DefinitionNavigator tgt) { - for (DefinitionNavigator t : slices) { - if (sliceMatchesByType(t, tgt)) - return t; - } - return null; - } - - private boolean sliceMatchesByType(DefinitionNavigator t, DefinitionNavigator tgt) { - return t.current().typeSummary().equals(tgt.current().typeSummary()); - } - - private void copySlices(List target, List source, List list) { - for (DefinitionNavigator slice : list) { - copySlice(target, source, slice); - } - } - - public void copySlice(List target, List source, DefinitionNavigator slice) { - target.add(slice.current().copy()); - int i = source.indexOf(slice.current())+1; - while (i < source.size() && source.get(i).getPath().startsWith(slice.current().getPath()+".")) { - target.add(source.get(i).copy()); - i++; - } - } - - private boolean isTypeSlicing(ElementDefinitionSlicingComponent slicing) { - if (slicing.getDiscriminator().size() == 1 && slicing.getDiscriminatorFirstRep().getType() == DiscriminatorType.TYPE && "$this".equals(slicing.getDiscriminatorFirstRep().getPath())) - return true; - return false; - } - - private boolean slicingMatches(ElementDefinitionSlicingComponent l, ElementDefinitionSlicingComponent r) { - if (l.getDiscriminator().size() != r.getDiscriminator().size()) - return false; - for (int i = 0; i < l.getDiscriminator().size(); i++) { - if (!slicingMatches(l.getDiscriminator().get(i), r.getDiscriminator().get(i))) - return false; - } - return l.getOrdered() == r.getOrdered(); - } - - private boolean slicingMatches(ElementDefinitionSlicingDiscriminatorComponent l, ElementDefinitionSlicingDiscriminatorComponent r) { - return l.getType() == r.getType() && l.getPath().equals(r.getPath()); - } - - private class ExtensionUsage { - private DefinitionNavigator defn; - private int minSuperset; - private int minSubset; - private String maxSuperset; - private String maxSubset; - private boolean both = false; - - public ExtensionUsage(DefinitionNavigator defn, int min, String max) { - super(); - this.defn = defn; - this.minSubset = min; - this.minSuperset = min; - this.maxSubset = max; - this.maxSuperset = max; - } - - } - private boolean compareExtensions(ProfileComparison outcome, String path, ElementDefinition superset, ElementDefinition subset, DefinitionNavigator left, DefinitionNavigator right) throws DefinitionException { - // for now, we don't handle sealed (or ordered) extensions - - // for an extension the superset is all extensions, and the subset is.. all extensions - well, unless thay are sealed. - // but it's not useful to report that. instead, we collate the defined ones, and just adjust the cardinalities - Map map = new HashMap(); - - if (left.slices() != null) - for (DefinitionNavigator ex : left.slices()) { - String url = ex.current().getType().get(0).getProfile().get(0).getValue(); - if (map.containsKey(url)) - throw new DefinitionException("Duplicate Extension "+url+" at "+path); - else - map.put(url, new ExtensionUsage(ex, ex.current().getMin(), ex.current().getMax())); - } - if (right.slices() != null) - for (DefinitionNavigator ex : right.slices()) { - String url = ex.current().getType().get(0).getProfile().get(0).getValue(); - if (map.containsKey(url)) { - ExtensionUsage exd = map.get(url); - exd.minSuperset = unionMin(exd.defn.current().getMin(), ex.current().getMin()); - exd.maxSuperset = unionMax(exd.defn.current().getMax(), ex.current().getMax()); - exd.minSubset = intersectMin(exd.defn.current().getMin(), ex.current().getMin()); - exd.maxSubset = intersectMax(exd.defn.current().getMax(), ex.current().getMax()); - exd.both = true; - outcome.rule(subset, exd.maxSubset.equals("*") || Integer.parseInt(exd.maxSubset) >= exd.minSubset, path, "Cardinality Mismatch on extension: "+card(exd.defn)+"/"+card(ex)); - } else { - map.put(url, new ExtensionUsage(ex, ex.current().getMin(), ex.current().getMax())); - } - } - List names = new ArrayList(); - names.addAll(map.keySet()); - Collections.sort(names); - for (String name : names) { - ExtensionUsage exd = map.get(name); - if (exd.both) - outcome.subset.getSnapshot().getElement().add(exd.defn.current().copy().setMin(exd.minSubset).setMax(exd.maxSubset)); - outcome.superset.getSnapshot().getElement().add(exd.defn.current().copy().setMin(exd.minSuperset).setMax(exd.maxSuperset)); - } - return true; - } - - private boolean isExtension(String path) { - return path.endsWith(".extension") || path.endsWith(".modifierExtension"); - } - - private boolean compareChildren(ElementDefinition ed, ProfileComparison outcome, String path, DefinitionNavigator left, DefinitionNavigator right) throws DefinitionException, IOException, FHIRFormatError { - List lc = left.children(); - List rc = right.children(); - // it's possible that one of these profiles walks into a data type and the other doesn't - // if it does, we have to load the children for that data into the profile that doesn't - // walk into it - if (lc.isEmpty() && !rc.isEmpty() && right.current().getType().size() == 1 && left.hasTypeChildren(right.current().getType().get(0))) - lc = left.childrenFromType(right.current().getType().get(0)); - if (rc.isEmpty() && !lc.isEmpty() && left.current().getType().size() == 1 && right.hasTypeChildren(left.current().getType().get(0))) - rc = right.childrenFromType(left.current().getType().get(0)); - if (lc.size() != rc.size()) { - outcome.messages.add(new ValidationMessage(Source.ProfileComparer, ValidationMessage.IssueType.STRUCTURE, path, "Different number of children at "+path+" ("+Integer.toString(lc.size())+"/"+Integer.toString(rc.size())+")", ValidationMessage.IssueSeverity.ERROR)); - status(ed, ProfileUtilities.STATUS_ERROR); - return false; - } else { - for (int i = 0; i < lc.size(); i++) { - DefinitionNavigator l = lc.get(i); - DefinitionNavigator r = rc.get(i); - String cpath = comparePaths(l.path(), r.path(), path, l.nameTail(), r.nameTail()); - if (cpath != null) { - if (!compareElements(outcome, cpath, l, r, null)) - return false; - } else { - outcome.messages.add(new ValidationMessage(Source.ProfileComparer, ValidationMessage.IssueType.STRUCTURE, path, "Different path at "+path+"["+Integer.toString(i)+"] ("+l.path()+"/"+r.path()+")", ValidationMessage.IssueSeverity.ERROR)); - status(ed, ProfileUtilities.STATUS_ERROR); - return false; - } - } - } - return true; - } - - private String comparePaths(String path1, String path2, String path, String tail1, String tail2) { - if (tail1.equals(tail2)) { - return path+"."+tail1; - } else if (tail1.endsWith("[x]") && tail2.startsWith(tail1.substring(0, tail1.length()-3))) { - return path+"."+tail1; - } else if (tail2.endsWith("[x]") && tail1.startsWith(tail2.substring(0, tail2.length()-3))) { - return path+"."+tail2; - } else - return null; - } - - private boolean compareBindings(ProfileComparison outcome, ElementDefinition subset, ElementDefinition superset, String path, ElementDefinition lDef, ElementDefinition rDef) throws FHIRFormatError { - assert(lDef.hasBinding() || rDef.hasBinding()); - if (!lDef.hasBinding()) { - subset.setBinding(rDef.getBinding()); - // technically, the super set is unbound, but that's not very useful - so we use the provided on as an example - superset.setBinding(rDef.getBinding().copy()); - superset.getBinding().setStrength(BindingStrength.EXAMPLE); - return true; - } - if (!rDef.hasBinding()) { - subset.setBinding(lDef.getBinding()); - superset.setBinding(lDef.getBinding().copy()); - superset.getBinding().setStrength(BindingStrength.EXAMPLE); - return true; - } - ElementDefinitionBindingComponent left = lDef.getBinding(); - ElementDefinitionBindingComponent right = rDef.getBinding(); - if (Base.compareDeep(left, right, false)) { - subset.setBinding(left); - superset.setBinding(right); - } - - // if they're both examples/preferred then: - // subset: left wins if they're both the same - // superset: - if (isPreferredOrExample(left) && isPreferredOrExample(right)) { - if (right.getStrength() == BindingStrength.PREFERRED && left.getStrength() == BindingStrength.EXAMPLE && !Base.compareDeep(left.getValueSet(), right.getValueSet(), false)) { - outcome.messages.add(new ValidationMessage(Source.ProfileComparer, ValidationMessage.IssueType.STRUCTURE, path, "Example/preferred bindings differ at "+path+" using binding from "+outcome.rightName(), ValidationMessage.IssueSeverity.INFORMATION)); - status(subset, ProfileUtilities.STATUS_HINT); - subset.setBinding(right); - superset.setBinding(unionBindings(superset, outcome, path, left, right)); - } else { - if ((right.getStrength() != BindingStrength.EXAMPLE || left.getStrength() != BindingStrength.EXAMPLE) && !Base.compareDeep(left.getValueSet(), right.getValueSet(), false) ) { - outcome.messages.add(new ValidationMessage(Source.ProfileComparer, ValidationMessage.IssueType.STRUCTURE, path, "Example/preferred bindings differ at "+path+" using binding from "+outcome.leftName(), ValidationMessage.IssueSeverity.INFORMATION)); - status(subset, ProfileUtilities.STATUS_HINT); - } - subset.setBinding(left); - superset.setBinding(unionBindings(superset, outcome, path, left, right)); - } - return true; - } - // if either of them are extensible/required, then it wins - if (isPreferredOrExample(left)) { - subset.setBinding(right); - superset.setBinding(unionBindings(superset, outcome, path, left, right)); - return true; - } - if (isPreferredOrExample(right)) { - subset.setBinding(left); - superset.setBinding(unionBindings(superset, outcome, path, left, right)); - return true; - } - - // ok, both are extensible or required. - ElementDefinitionBindingComponent subBinding = new ElementDefinitionBindingComponent(); - subset.setBinding(subBinding); - ElementDefinitionBindingComponent superBinding = new ElementDefinitionBindingComponent(); - superset.setBinding(superBinding); - subBinding.setDescription(mergeText(subset, outcome, path, "description", left.getDescription(), right.getDescription())); - superBinding.setDescription(mergeText(subset, outcome, null, "description", left.getDescription(), right.getDescription())); - if (left.getStrength() == BindingStrength.REQUIRED || right.getStrength() == BindingStrength.REQUIRED) - subBinding.setStrength(BindingStrength.REQUIRED); - else - subBinding.setStrength(BindingStrength.EXTENSIBLE); - if (left.getStrength() == BindingStrength.EXTENSIBLE || right.getStrength() == BindingStrength.EXTENSIBLE) - superBinding.setStrength(BindingStrength.EXTENSIBLE); - else - superBinding.setStrength(BindingStrength.REQUIRED); - - if (Base.compareDeep(left.getValueSet(), right.getValueSet(), false)) { - subBinding.setValueSet(left.getValueSet()); - superBinding.setValueSet(left.getValueSet()); - return true; - } else if (!left.hasValueSet()) { - outcome.messages.add(new ValidationMessage(Source.ProfileComparer, ValidationMessage.IssueType.STRUCTURE, path, "No left Value set at "+path, ValidationMessage.IssueSeverity.ERROR)); - return true; - } else if (!right.hasValueSet()) { - outcome.messages.add(new ValidationMessage(Source.ProfileComparer, ValidationMessage.IssueType.STRUCTURE, path, "No right Value set at "+path, ValidationMessage.IssueSeverity.ERROR)); - return true; - } else { - // ok, now we compare the value sets. This may be unresolvable. - ValueSet lvs = resolveVS(outcome.left, left.getValueSet()); - ValueSet rvs = resolveVS(outcome.right, right.getValueSet()); - if (lvs == null) { - outcome.messages.add(new ValidationMessage(Source.ProfileComparer, ValidationMessage.IssueType.STRUCTURE, path, "Unable to resolve left value set "+left.getValueSet().toString()+" at "+path, ValidationMessage.IssueSeverity.ERROR)); - return true; - } else if (rvs == null) { - outcome.messages.add(new ValidationMessage(Source.ProfileComparer, ValidationMessage.IssueType.STRUCTURE, path, "Unable to resolve right value set "+right.getValueSet().toString()+" at "+path, ValidationMessage.IssueSeverity.ERROR)); - return true; - } else { - // first, we'll try to do it by definition - ValueSet cvs = intersectByDefinition(lvs, rvs); - if(cvs == null) { - // if that didn't work, we'll do it by expansion - ValueSetExpansionOutcome le; - ValueSetExpansionOutcome re; - try { - le = context.expandVS(lvs, true, false); - re = context.expandVS(rvs, true, false); - if (le.getError() != null) { - outcome.messages.add(new ValidationMessage(Source.ProfileComparer, ValidationMessage.IssueType.STRUCTURE, path, "The value set "+lvs.getUrl()+" could not be expanded", ValidationMessage.IssueSeverity.ERROR)); - } else if (re.getError() != null) { - outcome.messages.add(new ValidationMessage(Source.ProfileComparer, ValidationMessage.IssueType.STRUCTURE, path, "The value set "+rvs.getUrl()+" could not be expanded", ValidationMessage.IssueSeverity.ERROR)); - } else if (!closed(le.getValueset())) { - outcome.messages.add(new ValidationMessage(Source.ProfileComparer, ValidationMessage.IssueType.STRUCTURE, path, "The value set "+lvs.getUrl()+" is not closed, so can't be compased", ValidationMessage.IssueSeverity.ERROR)); - } else if (!closed(re.getValueset())) { - outcome.messages.add(new ValidationMessage(Source.ProfileComparer, ValidationMessage.IssueType.STRUCTURE, path, "The value set "+rvs.getUrl()+" is not closed, so can't be compased", ValidationMessage.IssueSeverity.ERROR)); - } else { - cvs = intersectByExpansion(path, le.getValueset(), re.getValueset()); - if (!cvs.getCompose().hasInclude()) { - outcome.messages.add(new ValidationMessage(Source.ProfileComparer, ValidationMessage.IssueType.STRUCTURE, path, "The value sets "+lvs.getUrl()+" and "+rvs.getUrl()+" do not intersect", ValidationMessage.IssueSeverity.ERROR)); - status(subset, ProfileUtilities.STATUS_ERROR); - return false; - } - } - } catch (Exception e){ - outcome.messages.add(new ValidationMessage(Source.ProfileComparer, ValidationMessage.IssueType.STRUCTURE, path, "Unable to expand or process value sets "+lvs.getUrl()+" and "+rvs.getUrl()+": "+e.getMessage(), ValidationMessage.IssueSeverity.ERROR)); - status(subset, ProfileUtilities.STATUS_ERROR); - e.printStackTrace(); - return false; - } - } - if (cvs != null) { - subBinding.setValueSet("#"+addValueSet(cvs)); - superBinding.setValueSet("#"+addValueSet(unite(superset, outcome, path, lvs, rvs))); - } - } - } - return false; - } - - private ElementDefinitionBindingComponent unionBindings(ElementDefinition ed, ProfileComparison outcome, String path, ElementDefinitionBindingComponent left, ElementDefinitionBindingComponent right) throws FHIRFormatError { - ElementDefinitionBindingComponent union = new ElementDefinitionBindingComponent(); - if (left.getStrength().compareTo(right.getStrength()) < 0) - union.setStrength(left.getStrength()); - else - union.setStrength(right.getStrength()); - union.setDescription(mergeText(ed, outcome, path, "binding.description", left.getDescription(), right.getDescription())); - if (Base.compareDeep(left.getValueSet(), right.getValueSet(), false)) - union.setValueSet(left.getValueSet()); - else { - ValueSet lvs = resolveVS(outcome.left, left.getValueSet()); - ValueSet rvs = resolveVS(outcome.left, right.getValueSet()); - if (lvs != null && rvs != null) - union.setValueSet("#"+addValueSet(unite(ed, outcome, path, lvs, rvs))); - else if (lvs != null) - union.setValueSet("#"+addValueSet(lvs)); - else if (rvs != null) - union.setValueSet("#"+addValueSet(rvs)); - } - return union; - } - - - private ValueSet unite(ElementDefinition ed, ProfileComparison outcome, String path, ValueSet lvs, ValueSet rvs) { - ValueSet vs = new ValueSet(); - vs.setName(path); - if (lvs.hasCompose()) { - for (ConceptSetComponent inc : lvs.getCompose().getInclude()) - vs.getCompose().getInclude().add(inc); - if (lvs.getCompose().hasExclude()) { - outcome.messages.add(new ValidationMessage(Source.ProfileComparer, ValidationMessage.IssueType.STRUCTURE, path, "The value sets "+lvs.getUrl()+" has exclude statements, and no union involving it can be correctly determined", ValidationMessage.IssueSeverity.ERROR)); - status(ed, ProfileUtilities.STATUS_ERROR); - } - } - if (rvs.hasCompose()) { - for (ConceptSetComponent inc : rvs.getCompose().getInclude()) - if (!mergeIntoExisting(vs.getCompose().getInclude(), inc)) - vs.getCompose().getInclude().add(inc); - if (rvs.getCompose().hasExclude()) { - outcome.messages.add(new ValidationMessage(Source.ProfileComparer, ValidationMessage.IssueType.STRUCTURE, path, "The value sets "+lvs.getUrl()+" has exclude statements, and no union involving it can be correctly determined", ValidationMessage.IssueSeverity.ERROR)); - status(ed, ProfileUtilities.STATUS_ERROR); - } - } - return vs; - } - - private boolean mergeIntoExisting(List include, ConceptSetComponent inc) { - for (ConceptSetComponent dst : include) { - if (Base.compareDeep(dst, inc, false)) - return true; // they're actually the same - if (dst.hasSystem() && dst.getSystem().equals(inc.getSystem())) { - if (inc.hasFilter() || dst.hasFilter()) { - return false; // just add the new one as a a parallel - } else if (inc.hasConcept() && dst.hasConcept()) { - for (ConceptReferenceComponent cc : inc.getConcept()) { - boolean found = false; - for (ConceptReferenceComponent dd : dst.getConcept()) { - if (dd.getCode().equals(cc.getCode())) - found = true; - if (found) { - if (cc.hasDisplay() && !dd.hasDisplay()) - dd.setDisplay(cc.getDisplay()); - break; - } - } - if (!found) - dst.getConcept().add(cc.copy()); - } - } else - dst.getConcept().clear(); // one of them includes the entire code system - } - } - return false; - } - - private ValueSet resolveVS(StructureDefinition ctxtLeft, String vsRef) { - if (vsRef == null) - return null; - return context.fetchResource(ValueSet.class, vsRef); - } - - private ValueSet intersectByDefinition(ValueSet lvs, ValueSet rvs) { - // this is just a stub. The idea is that we try to avoid expanding big open value sets from SCT, RxNorm, LOINC. - // there's a bit of long hand logic coming here, but that's ok. - return null; - } - - private ValueSet intersectByExpansion(String path, ValueSet lvs, ValueSet rvs) { - // this is pretty straight forward - we intersect the lists, and build a compose out of the intersection - ValueSet vs = new ValueSet(); - vs.setName(path); - vs.setStatus(PublicationStatus.DRAFT); - - Map left = new HashMap(); - scan(lvs.getExpansion().getContains(), left); - Map right = new HashMap(); - scan(rvs.getExpansion().getContains(), right); - Map inc = new HashMap(); - - for (String s : left.keySet()) { - if (right.containsKey(s)) { - ValueSetExpansionContainsComponent cc = left.get(s); - ConceptSetComponent c = inc.get(cc.getSystem()); - if (c == null) { - c = vs.getCompose().addInclude().setSystem(cc.getSystem()); - inc.put(cc.getSystem(), c); - } - c.addConcept().setCode(cc.getCode()).setDisplay(cc.getDisplay()); - } - } - return vs; - } - - private void scan(List list, Map map) { - for (ValueSetExpansionContainsComponent cc : list) { - if (cc.hasSystem() && cc.hasCode()) { - String s = cc.getSystem()+"::"+cc.getCode(); - if (!map.containsKey(s)) - map.put(s, cc); - } - if (cc.hasContains()) - scan(cc.getContains(), map); - } - } - - private boolean closed(ValueSet vs) { - return !ToolingExtensions.findBooleanExtension(vs.getExpansion(), ToolingExtensions.EXT_UNCLOSED); - } - - private boolean isPreferredOrExample(ElementDefinitionBindingComponent binding) { - return binding.getStrength() == BindingStrength.EXAMPLE || binding.getStrength() == BindingStrength.PREFERRED; - } - - private Collection intersectTypes(ElementDefinition ed, ProfileComparison outcome, String path, List left, List right) throws DefinitionException, IOException, FHIRFormatError { - List result = new ArrayList(); - for (TypeRefComponent l : left) { - if (l.hasAggregation()) - throw new DefinitionException("Aggregation not supported: "+path); - boolean pfound = false; - boolean tfound = false; - TypeRefComponent c = l.copy(); - for (TypeRefComponent r : right) { - if (r.hasAggregation()) - throw new DefinitionException("Aggregation not supported: "+path); - if (!l.hasProfile() && !r.hasProfile()) { - pfound = true; - } else if (!r.hasProfile()) { - pfound = true; - } else if (!l.hasProfile()) { - pfound = true; - c.setProfile(r.getProfile()); - } else { - StructureDefinition sdl = resolveProfile(ed, outcome, path, l.getProfile().get(0).getValue(), outcome.leftName()); - StructureDefinition sdr = resolveProfile(ed, outcome, path, r.getProfile().get(0).getValue(), outcome.rightName()); - if (sdl != null && sdr != null) { - if (sdl == sdr) { - pfound = true; - } else if (derivesFrom(sdl, sdr)) { - pfound = true; - } else if (derivesFrom(sdr, sdl)) { - c.setProfile(r.getProfile()); - pfound = true; - } else if (sdl.getType().equals(sdr.getType())) { - ProfileComparison comp = compareProfiles(sdl, sdr); - if (comp.getSubset() != null) { - pfound = true; - c.addProfile("#"+comp.id); - } - } - } - } - if (!l.hasTargetProfile() && !r.hasTargetProfile()) { - tfound = true; - } else if (!r.hasTargetProfile()) { - tfound = true; - } else if (!l.hasTargetProfile()) { - tfound = true; - c.setTargetProfile(r.getTargetProfile()); - } else { - StructureDefinition sdl = resolveProfile(ed, outcome, path, l.getTargetProfile().get(0).getValue(), outcome.leftName()); - StructureDefinition sdr = resolveProfile(ed, outcome, path, r.getTargetProfile().get(0).getValue(), outcome.rightName()); - if (sdl != null && sdr != null) { - if (sdl == sdr) { - tfound = true; - } else if (derivesFrom(sdl, sdr)) { - tfound = true; - } else if (derivesFrom(sdr, sdl)) { - c.setTargetProfile(r.getTargetProfile()); - tfound = true; - } else if (sdl.getType().equals(sdr.getType())) { - ProfileComparison comp = compareProfiles(sdl, sdr); - if (comp.getSubset() != null) { - tfound = true; - c.addTargetProfile("#"+comp.id); - } - } - } - } - } - if (pfound && tfound) - result.add(c); - } - return result; - } - - private StructureDefinition resolveProfile(ElementDefinition ed, ProfileComparison outcome, String path, String url, String name) { - StructureDefinition res = context.fetchResource(StructureDefinition.class, url); - if (res == null) { - outcome.messages.add(new ValidationMessage(Source.ProfileComparer, ValidationMessage.IssueType.INFORMATIONAL, path, "Unable to resolve profile "+url+" in profile "+name, ValidationMessage.IssueSeverity.WARNING)); - status(ed, ProfileUtilities.STATUS_HINT); - } - return res; - } - - private Collection unionTypes(String path, List left, List right) throws DefinitionException, IOException, FHIRFormatError { - List result = new ArrayList(); - for (TypeRefComponent l : left) - checkAddTypeUnion(path, result, l); - for (TypeRefComponent r : right) - checkAddTypeUnion(path, result, r); - return result; - } - - private void checkAddTypeUnion(String path, List results, TypeRefComponent nw) throws DefinitionException, IOException, FHIRFormatError { - boolean pfound = false; - boolean tfound = false; - nw = nw.copy(); - if (nw.hasAggregation()) - throw new DefinitionException("Aggregation not supported: "+path); - for (TypeRefComponent ex : results) { - if (Utilities.equals(ex.getWorkingCode(), nw.getWorkingCode())) { - if (!ex.hasProfile() && !nw.hasProfile()) - pfound = true; - else if (!ex.hasProfile()) { - pfound = true; - } else if (!nw.hasProfile()) { - pfound = true; - ex.setProfile(null); - } else { - // both have profiles. Is one derived from the other? - StructureDefinition sdex = context.fetchResource(StructureDefinition.class, ex.getProfile().get(0).getValue()); - StructureDefinition sdnw = context.fetchResource(StructureDefinition.class, nw.getProfile().get(0).getValue()); - if (sdex != null && sdnw != null) { - if (sdex == sdnw) { - pfound = true; - } else if (derivesFrom(sdex, sdnw)) { - ex.setProfile(nw.getProfile()); - pfound = true; - } else if (derivesFrom(sdnw, sdex)) { - pfound = true; - } else if (sdnw.getSnapshot().getElement().get(0).getPath().equals(sdex.getSnapshot().getElement().get(0).getPath())) { - ProfileComparison comp = compareProfiles(sdex, sdnw); - if (comp.getSuperset() != null) { - pfound = true; - ex.addProfile("#"+comp.id); - } - } - } - } - if (!ex.hasTargetProfile() && !nw.hasTargetProfile()) - tfound = true; - else if (!ex.hasTargetProfile()) { - tfound = true; - } else if (!nw.hasTargetProfile()) { - tfound = true; - ex.setTargetProfile(null); - } else { - // both have profiles. Is one derived from the other? - StructureDefinition sdex = context.fetchResource(StructureDefinition.class, ex.getTargetProfile().get(0).getValue()); - StructureDefinition sdnw = context.fetchResource(StructureDefinition.class, nw.getTargetProfile().get(0).getValue()); - if (sdex != null && sdnw != null) { - if (sdex == sdnw) { - tfound = true; - } else if (derivesFrom(sdex, sdnw)) { - ex.setTargetProfile(nw.getTargetProfile()); - tfound = true; - } else if (derivesFrom(sdnw, sdex)) { - tfound = true; - } else if (sdnw.getSnapshot().getElement().get(0).getPath().equals(sdex.getSnapshot().getElement().get(0).getPath())) { - ProfileComparison comp = compareProfiles(sdex, sdnw); - if (comp.getSuperset() != null) { - tfound = true; - ex.addTargetProfile("#"+comp.id); - } - } - } - } - } - } - if (!tfound || !pfound) - results.add(nw); - } - - - private boolean derivesFrom(StructureDefinition left, StructureDefinition right) { - // left derives from right if it's base is the same as right - // todo: recursive... - return left.hasBaseDefinition() && left.getBaseDefinition().equals(right.getUrl()); - } - - - private String mergeText(ElementDefinition ed, ProfileComparison outcome, String path, String name, String left, String right) { - if (left == null && right == null) - return null; - if (left == null) - return right; - if (right == null) - return left; - left = stripLinks(left); - right = stripLinks(right); - if (left.equalsIgnoreCase(right)) - return left; - if (path != null) { - outcome.messages.add(new ValidationMessage(Source.ProfileComparer, ValidationMessage.IssueType.INFORMATIONAL, path, "Elements differ in definition for "+name+":\r\n \""+left+"\"\r\n \""+right+"\"", - "Elements differ in definition for "+name+":
    \""+Utilities.escapeXml(left)+"\"
    \""+Utilities.escapeXml(right)+"\"", ValidationMessage.IssueSeverity.INFORMATION)); - status(ed, ProfileUtilities.STATUS_HINT); - } - return "left: "+left+"; right: "+right; - } - - - private String stripLinks(String s) { - while (s.contains("](")) { - int i = s.indexOf("]("); - int j = s.substring(i).indexOf(")"); - if (j == -1) - return s; - else - s = s.substring(0, i+1)+s.substring(i+j+1); - } - return s; - } - - private List mergeCodings(List left, List right) { - List result = new ArrayList(); - result.addAll(left); - for (Coding c : right) { - boolean found = false; - for (Coding ct : left) - if (Utilities.equals(c.getSystem(), ct.getSystem()) && Utilities.equals(c.getCode(), ct.getCode())) - found = true; - if (!found) - result.add(c); - } - return result; - } - - private List mergeStrings(List left, List right) { - List result = new ArrayList(); - result.addAll(left); - for (StringType c : right) { - boolean found = false; - for (StringType ct : left) - if (Utilities.equals(c.getValue(), ct.getValue())) - found = true; - if (!found) - result.add(c); - } - return result; - } - - private List mergeMappings(List left, List right) { - List result = new ArrayList(); - result.addAll(left); - for (ElementDefinitionMappingComponent c : right) { - boolean found = false; - for (ElementDefinitionMappingComponent ct : left) - if (Utilities.equals(c.getIdentity(), ct.getIdentity()) && Utilities.equals(c.getLanguage(), ct.getLanguage()) && Utilities.equals(c.getMap(), ct.getMap())) - found = true; - if (!found) - result.add(c); - } - return result; - } - - // we can't really know about constraints. We create warnings, and collate them - private List unionConstraints(ElementDefinition ed, ProfileComparison outcome, String path, List left, List right) { - List result = new ArrayList(); - for (ElementDefinitionConstraintComponent l : left) { - boolean found = false; - for (ElementDefinitionConstraintComponent r : right) - if (Utilities.equals(r.getId(), l.getId()) || (Utilities.equals(r.getXpath(), l.getXpath()) && r.getSeverity() == l.getSeverity())) - found = true; - if (!found) { - outcome.messages.add(new ValidationMessage(Source.ProfileComparer, ValidationMessage.IssueType.STRUCTURE, path, "StructureDefinition "+outcome.leftName()+" has a constraint that is not found in "+outcome.rightName()+" and it is uncertain whether they are compatible ("+l.getXpath()+")", ValidationMessage.IssueSeverity.INFORMATION)); - status(ed, ProfileUtilities.STATUS_WARNING); - } - result.add(l); - } - for (ElementDefinitionConstraintComponent r : right) { - boolean found = false; - for (ElementDefinitionConstraintComponent l : left) - if (Utilities.equals(r.getId(), l.getId()) || (Utilities.equals(r.getXpath(), l.getXpath()) && r.getSeverity() == l.getSeverity())) - found = true; - if (!found) { - outcome.messages.add(new ValidationMessage(Source.ProfileComparer, ValidationMessage.IssueType.STRUCTURE, path, "StructureDefinition "+outcome.rightName()+" has a constraint that is not found in "+outcome.leftName()+" and it is uncertain whether they are compatible ("+r.getXpath()+")", ValidationMessage.IssueSeverity.INFORMATION)); - status(ed, ProfileUtilities.STATUS_WARNING); - result.add(r); - } - } - return result; - } - - - private List intersectConstraints(String path, List left, List right) { - List result = new ArrayList(); - for (ElementDefinitionConstraintComponent l : left) { - boolean found = false; - for (ElementDefinitionConstraintComponent r : right) - if (Utilities.equals(r.getId(), l.getId()) || (Utilities.equals(r.getXpath(), l.getXpath()) && r.getSeverity() == l.getSeverity())) - found = true; - if (found) - result.add(l); - } - return result; -} - - private String card(DefinitionNavigator defn) { - return Integer.toString(defn.current().getMin())+".."+defn.current().getMax(); - } - - private String typeCode(DefinitionNavigator defn) { - CommaSeparatedStringBuilder b = new CommaSeparatedStringBuilder(); - for (TypeRefComponent t : defn.current().getType()) - b.append(t.getWorkingCode()+(t.hasProfile() ? "("+t.getProfile()+")" : "")+(t.hasTargetProfile() ? "("+t.getTargetProfile()+")" : "")); // todo: other properties - return b.toString(); - } - - private int intersectMin(int left, int right) { - if (left > right) - return left; - else - return right; - } - - private int unionMin(int left, int right) { - if (left > right) - return right; - else - return left; - } - - private String intersectMax(String left, String right) { - int l = "*".equals(left) ? Integer.MAX_VALUE : Integer.parseInt(left); - int r = "*".equals(right) ? Integer.MAX_VALUE : Integer.parseInt(right); - if (l < r) - return left; - else - return right; - } - - private String unionMax(String left, String right) { - int l = "*".equals(left) ? Integer.MAX_VALUE : Integer.parseInt(left); - int r = "*".equals(right) ? Integer.MAX_VALUE : Integer.parseInt(right); - if (l < r) - return right; - else - return left; - } - - private IntegerType intersectMaxLength(int left, int right) { - if (left == 0) - left = Integer.MAX_VALUE; - if (right == 0) - right = Integer.MAX_VALUE; - if (left < right) - return left == Integer.MAX_VALUE ? null : new IntegerType(left); - else - return right == Integer.MAX_VALUE ? null : new IntegerType(right); - } - - private IntegerType unionMaxLength(int left, int right) { - if (left == 0) - left = Integer.MAX_VALUE; - if (right == 0) - right = Integer.MAX_VALUE; - if (left < right) - return right == Integer.MAX_VALUE ? null : new IntegerType(right); - else - return left == Integer.MAX_VALUE ? null : new IntegerType(left); - } - - - public String addValueSet(ValueSet cvs) { - String id = Integer.toString(valuesets.size()+1); - cvs.setId(id); - valuesets.add(cvs); - return id; - } - - - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getLeftLink() { - return leftLink; - } - - public void setLeftLink(String leftLink) { - this.leftLink = leftLink; - } - - public String getLeftName() { - return leftName; - } - - public void setLeftName(String leftName) { - this.leftName = leftName; - } - - public String getRightLink() { - return rightLink; - } - - public void setRightLink(String rightLink) { - this.rightLink = rightLink; - } - - public String getRightName() { - return rightName; - } - - public void setRightName(String rightName) { - this.rightName = rightName; - } - - public String getLeftPrefix() { - return leftPrefix; - } - - public void setLeftPrefix(String leftPrefix) { - this.leftPrefix = leftPrefix; - } - - public String getRightPrefix() { - return rightPrefix; - } - - public void setRightPrefix(String rightPrefix) { - this.rightPrefix = rightPrefix; - } - - private String genPCLink(String name, String link, String prefix) { - if (link == null) { - return name; - } else if (!Utilities.isAbsoluteUrl(link) && !Utilities.noString(prefix)) { - return ""+Utilities.escapeXml(name)+""; - } else { - return ""+Utilities.escapeXml(name)+""; - } - } - - private String genValueSets(String base) throws IOException, FHIRException, EOperationOutcome { - StringBuilder b = new StringBuilder(); - b.append("
      \r\n"); - for (ValueSet vs : getValuesets()) { - System.out.println(" .. Value set: "+vs.getName()); - b.append("
    • "); - b.append(" "+Utilities.escapeXml(vs.present())+""); - b.append("
      • \r\n"); - genValueSetFile(base+"-"+vs.getId()+".html", vs); - } - b.append("
    \r\n"); - return b.toString(); - } - - private void genValueSetFile(String filename, ValueSet vs) throws IOException, FHIRException, EOperationOutcome { - RenderingContext rc = new RenderingContext(context, null, null, "http://hl7.org/fhir", "", null, ResourceRendererMode.RESOURCE); - rc.setNoSlowLookup(true); - RendererFactory.factory(vs, rc).render(vs); - String s = new XhtmlComposer(XhtmlComposer.HTML).compose(vs.getText().getDiv()); - StringBuilder b = new StringBuilder(); - b.append(""); - b.append(""); - b.append(""+vs.present()+""); - b.append("\r\n"); - b.append(""); - b.append(""); - b.append("

    "+vs.present()+"

    "); - b.append(s); - b.append(""); - b.append(""); - TextFile.stringToFile(b.toString(), filename); - } - - private String genPCTable() { - StringBuilder b = new StringBuilder(); - - b.append("\r\n"); - b.append(""); - b.append(" "); - b.append(" "); - b.append(" "); - b.append(" "); - b.append(" "); - b.append(" "); - b.append(""); - - for (ProfileComparison cmp : getComparisons()) { - b.append(""); - b.append(" "); - b.append(" "); - b.append(" "); - b.append(" "); - b.append(" "); - b.append(" "); - b.append(""); - } - b.append("
    LeftRightComparisonError #Warning #Hint #
    "+Utilities.escapeXml(cmp.getLeft().getName())+""+Utilities.escapeXml(cmp.getRight().getName())+"Click Here"+cmp.getErrorCount()+""+cmp.getWarningCount()+""+cmp.getHintCount()+"
    \r\n"); - - return b.toString(); - } - - - private String fixLink(String path, String pfx) { - return (pfx == null || Utilities.isAbsoluteUrl(path)) ? path : Utilities.pathURL(pfx, path); - } - - private String genCmpMessages(ProfileComparison cmp) { - StringBuilder b = new StringBuilder(); - b.append("\r\n"); - b.append("\r\n"); - b.append("\r\n"); - boolean found = false; - for (ValidationMessage vm : cmp.getMessages()) - if (vm.getLevel() == IssueSeverity.ERROR || vm.getLevel() == IssueSeverity.FATAL) { - found = true; - b.append("\r\n"); - } - if (!found) - b.append("\r\n"); - - boolean first = true; - for (ValidationMessage vm : cmp.getMessages()) - if (vm.getLevel() == IssueSeverity.WARNING) { - if (first) { - first = false; - b.append("\r\n"); - } - b.append("\r\n"); - } - first = true; - for (ValidationMessage vm : cmp.getMessages()) - if (vm.getLevel() == IssueSeverity.INFORMATION) { - if (first) { - b.append("\r\n"); - first = false; - } - b.append("\r\n"); - } - b.append("
    PathMessage
    Errors Detected
    "+vm.getLocation()+""+vm.getHtml()+(vm.getLevel() == IssueSeverity.FATAL ? "(This error terminated the comparison process)" : "")+"
    (None)
    Warnings about the comparison
    "+vm.getLocation()+""+vm.getHtml()+"
    Notes about differences (e.g. definitions)
    "+vm.getLocation()+""+vm.getHtml()+"
    \r\n"); - return b.toString(); - } - - private String genCompModel(StructureDefinition sd, String name, String base, String prefix, String dest) throws FHIRException, IOException { - if (sd == null) - return "

    No "+name+" could be generated

    \r\n"; - return new XhtmlComposer(XhtmlComposer.HTML).compose(new ProfileUtilities(context, null, this).generateTable("?gen-cm?", sd, false, dest, false, base, true, prefix, prefix, false, false, null, true)); - } - - - public String generate() throws IOException, FHIRException, EOperationOutcome { - for (ValueSet vs : valuesets) { - vs.setUserData("path", folder+"/"+getId()+"-vs-"+vs.getId()+".html"); - } - // ok, all compared; now produce the output - // first page we produce is simply the index - Map vars = new HashMap(); - vars.put("title", getTitle()); - vars.put("left", genPCLink(getLeftName(), getLeftLink(), getLeftPrefix())); - vars.put("right", genPCLink(getRightName(), getRightLink(), getRightPrefix())); - vars.put("table", genPCTable()); - vars.put("valuesets", genValueSets(folder+"/"+getId()+"-vs")); - producePage(summaryTemplate(), Utilities.path(folder, getId()+".html"), vars); - - // then we produce a comparison page for each pair - for (ProfileComparison cmp : getComparisons()) { - vars.clear(); - vars.put("title", getTitle()); - vars.put("left", genPCLink(getLeftName(), getLeftLink(), getLeftPrefix())); - vars.put("right", genPCLink(getRightName(), getRightLink(), getRightPrefix())); - vars.put("messages", genCmpMessages(cmp)); - vars.put("subset", genCompModel(cmp.getSubset(), "intersection", getId()+"."+cmp.getId(), "", folder)); - vars.put("superset", genCompModel(cmp.getSuperset(), "union", getId()+"."+cmp.getId(), "", folder)); - producePage(singleTemplate(), Utilities.path(folder, getId()+"."+cmp.getId()+".html"), vars); - } -// // and also individual pages for each pair outcome -// // then we produce value set pages for each value set -// -// // TODO Auto-generated method stub - return Utilities.path(folder, getId()+".html"); - } - - - private void producePage(String src, String path, Map vars) throws IOException { - while (src.contains("[%")) - { - int i1 = src.indexOf("[%"); - int i2 = src.substring(i1).indexOf("%]")+i1; - String s1 = src.substring(0, i1); - String s2 = src.substring(i1 + 2, i2).trim(); - String s3 = src.substring(i2+2); - String v = vars.containsKey(s2) ? vars.get(s2) : "?pp??"; - src = s1+v+s3; - } - TextFile.stringToFile(src, path); - } - - private String summaryTemplate() throws IOException { - return TextFile.fileToString(Utilities.path(folder, "template-comparison-set.html")); - } - - private String singleTemplate() throws IOException { - return TextFile.fileToString(Utilities.path(folder, "template-comparison.html")); - } - - private String cachedFetch(String id, String source) throws IOException { - String tmpDir = System.getProperty("java.io.tmpdir"); - String local = Utilities.path(tmpDir, id); - File f = new File(local); - if (f.exists()) - return TextFile.fileToString(f); - URL url = new URL(source); - URLConnection c = url.openConnection(); - String result = TextFile.streamToString(c.getInputStream()); - TextFile.stringToFile(result, f); - return result; - } - - @Override - public boolean isDatatype(String typeSimple) { - throw new Error("Not done yet"); - } - - @Override - public boolean isResource(String typeSimple) { - throw new Error("Not done yet"); - } - - @Override - public boolean hasLinkFor(String name) { - StructureDefinition sd = context.fetchTypeDefinition(name); - return sd != null && sd.hasUserData("path"); - } - - @Override - public String getLinkFor(String corePath, String name) { - StructureDefinition sd = context.fetchTypeDefinition(name); - return sd == null ? null : sd.getUserString("path"); - } - - @Override - public BindingResolution resolveBinding(StructureDefinition def, ElementDefinitionBindingComponent binding, String path) throws FHIRException { - return resolveBindingInt(def, binding.getValueSet(), binding.getDescription()); - } - - @Override - public BindingResolution resolveBinding(StructureDefinition def, String url, String path) throws FHIRException { - return resolveBindingInt(def, url, url); - } - - public BindingResolution resolveBindingInt(StructureDefinition def, String url, String desc) throws FHIRException { - ValueSet vs = null; - if (url != null && url.startsWith("#")) { - for (ValueSet t : valuesets) { - if (("#"+t.getId()).equals(url)) { - vs = t; - break; - } - } - } - if (url != null && vs == null) - context.fetchResource(ValueSet.class, url); - BindingResolution br = new BindingResolution(); - if (vs != null) { - br.display = vs.present(); - br.url = vs.getUserString("path"); - } else { - br.display = desc; - } - return br; - } - - @Override - public String getLinkForProfile(StructureDefinition profile, String url) { - StructureDefinition sd = context.fetchResource(StructureDefinition.class, url); - return sd == null ? null : sd.getUserString("path")+"|"+sd.present(); - } - - @Override - public boolean prependLinks() { - return false; - } - - @Override - public String getLinkForUrl(String corePath, String s) { - return null; - } - - public int getErrCount() { - int res = 0; - for (ProfileComparison pc : comparisons) { - res = res + pc.getErrorCount(); - } - return res; - - } - - - - -} \ No newline at end of file diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/ProfileComparer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/ProfileComparer.java index 25a3732fd..a6af935e6 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/ProfileComparer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/ProfileComparer.java @@ -7,8 +7,11 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.exceptions.DefinitionException; +import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.exceptions.FHIRFormatError; import org.hl7.fhir.r5.comparison.ValueSetComparer.ValueSetComparison; +import org.hl7.fhir.r5.conformance.ProfileUtilities; +import org.hl7.fhir.r5.conformance.ProfileUtilities.UnusedTracker; import org.hl7.fhir.r5.formats.IParser; import org.hl7.fhir.r5.model.Base; import org.hl7.fhir.r5.model.Coding; @@ -30,6 +33,11 @@ import org.hl7.fhir.utilities.CommaSeparatedStringBuilder; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.utilities.validation.ValidationMessage; import org.hl7.fhir.utilities.validation.ValidationMessage.IssueSeverity; +import org.hl7.fhir.utilities.xhtml.HierarchicalTableGenerator; +import org.hl7.fhir.utilities.xhtml.HierarchicalTableGenerator.Cell; +import org.hl7.fhir.utilities.xhtml.HierarchicalTableGenerator.Row; +import org.hl7.fhir.utilities.xhtml.HierarchicalTableGenerator.TableModel; +import org.hl7.fhir.utilities.xhtml.XhtmlNode; public class ProfileComparer extends CanonicalResourceComparer { @@ -50,10 +58,21 @@ public class ProfileComparer extends CanonicalResourceComparer { protected String abbreviation() { return "sd"; } + + @Override + protected String summary() { + return "Profile: "+left.present()+" vs "+right.present(); + } } - public ProfileComparer(ComparisonSession session) { + + + + private ProfileUtilities utils; + + public ProfileComparer(ComparisonSession session, ProfileUtilities utils) { super(session); + this.utils = utils; } @Override @@ -95,6 +114,7 @@ public class ProfileComparer extends CanonicalResourceComparer { DefinitionNavigator rn = new DefinitionNavigator(session.getContext(), right); StructuralMatch sm = new StructuralMatch(ln.current(), rn.current()); compareElements(res, sm, ln.path(), null, ln, rn); + res.combined = sm; } return res; } @@ -143,17 +163,21 @@ public class ProfileComparer extends CanonicalResourceComparer { subset.setIsSummary(left.current().getIsSummary()); // descriptive properties from ElementDefinition - merge them: - subset.setLabel(mergeText(comp, res, path, "label", left.current().getLabel(), right.current().getLabel())); - subset.setShort(mergeText(comp, res, path, "short", left.current().getShort(), right.current().getShort())); - subset.setDefinition(mergeText(comp, res, path, "definition", left.current().getDefinition(), right.current().getDefinition())); - subset.setComment(mergeText(comp, res, path, "comments", left.current().getComment(), right.current().getComment())); - subset.setRequirements(mergeText(comp, res, path, "requirements", left.current().getRequirements(), right.current().getRequirements())); + subset.setLabel(mergeText(comp, res, path, "label", left.current().getLabel(), right.current().getLabel(), false)); + subset.setShort(mergeText(comp, res, path, "short", left.current().getShort(), right.current().getShort(), false)); + subset.setDefinition(mergeText(comp, res, path, "definition", left.current().getDefinition(), right.current().getDefinition(), false)); + subset.setComment(mergeText(comp, res, path, "comments", left.current().getComment(), right.current().getComment(), false)); + subset.setRequirements(mergeText(comp, res, path, "requirements", left.current().getRequirements(), right.current().getRequirements(), false)); subset.getCode().addAll(mergeCodings(left.current().getCode(), right.current().getCode())); subset.getAlias().addAll(mergeStrings(left.current().getAlias(), right.current().getAlias())); subset.getMapping().addAll(mergeMappings(left.current().getMapping(), right.current().getMapping())); // left will win for example subset.setExample(left.current().hasExample() ? left.current().getExample() : right.current().getExample()); + if (left.current().getMustSupport() != right.current().getMustSupport()) { + vm(IssueSeverity.ERROR, "Elements differ in definition for mustSupport:\r\n \""+left.current().getMustSupport()+"\"\r\n \""+right.current().getMustSupport()+"\"", path, comp.getMessages(), res.getMessages()); + + } subset.setMustSupport(left.current().getMustSupport() || right.current().getMustSupport()); ElementDefinition superset = subset.copy(); @@ -278,7 +302,7 @@ public class ProfileComparer extends CanonicalResourceComparer { private DefinitionNavigator findInList(List rc, DefinitionNavigator l) { for (DefinitionNavigator t : rc) { - if (t.current().getPath().equals(l.current().getPath())) { + if (tail(t.current().getPath()).equals(tail(l.current().getPath()))) { return t; } } @@ -292,8 +316,8 @@ public class ProfileComparer extends CanonicalResourceComparer { vm(IssueSeverity.ERROR, "Added "+name, path, comp.getMessages(), res.getMessages()); } else if (vRight == null) { vm(IssueSeverity.ERROR, "Removed "+name, path, comp.getMessages(), res.getMessages()); - } else if (Base.compareDeep(vLeft, vRight, false)) { - vm(IssueSeverity.ERROR, name+" be the same ("+toString(vLeft)+"/"+toString(vRight)+")", path, comp.getMessages(), res.getMessages()); + } else if (!Base.compareDeep(vLeft, vRight, false)) { + vm(IssueSeverity.ERROR, name+" must be the same ("+toString(vLeft)+"/"+toString(vRight)+")", path, comp.getMessages(), res.getMessages()); } } @@ -324,7 +348,7 @@ public class ProfileComparer extends CanonicalResourceComparer { return test; } - private String mergeText(ProfileComparison comp, StructuralMatch res, String path, String name, String left, String right) { + private String mergeText(ProfileComparison comp, StructuralMatch res, String path, String name, String left, String right, boolean isError) { if (left == null && right == null) return null; if (left == null) @@ -336,7 +360,7 @@ public class ProfileComparer extends CanonicalResourceComparer { if (left.equalsIgnoreCase(right)) return left; if (path != null) { - vm(IssueSeverity.ERROR, "Elements differ in definition for "+name+":\r\n \""+left+"\"\r\n \""+right+"\"", path, comp.getMessages(), res.getMessages()); + vm(isError ? IssueSeverity.ERROR : IssueSeverity.WARNING, "Elements differ in "+name+":\r\n \""+left+"\"\r\n \""+right+"\"", path, comp.getMessages(), res.getMessages()); } return "left: "+left+"; right: "+right; } @@ -661,8 +685,8 @@ public class ProfileComparer extends CanonicalResourceComparer { subset.setBinding(subBinding); ElementDefinitionBindingComponent superBinding = new ElementDefinitionBindingComponent(); superset.setBinding(superBinding); - subBinding.setDescription(mergeText(comp, res, path, "description", left.getDescription(), right.getDescription())); - superBinding.setDescription(mergeText(comp, res, path, "description", left.getDescription(), right.getDescription())); + subBinding.setDescription(mergeText(comp, res, path, "description", left.getDescription(), right.getDescription(), false)); + superBinding.setDescription(mergeText(comp, res, path, "description", left.getDescription(), right.getDescription(), false)); if (left.getStrength() == BindingStrength.REQUIRED || right.getStrength() == BindingStrength.REQUIRED) subBinding.setStrength(BindingStrength.REQUIRED); else @@ -776,7 +800,7 @@ public class ProfileComparer extends CanonicalResourceComparer { union.setStrength(left.getStrength()); else union.setStrength(right.getStrength()); - union.setDescription(mergeText(comp, res, path, "binding.description", left.getDescription(), right.getDescription())); + union.setDescription(mergeText(comp, res, path, "binding.description", left.getDescription(), right.getDescription(), false)); if (Base.compareDeep(left.getValueSet(), right.getValueSet(), false)) union.setValueSet(left.getValueSet()); else { @@ -802,8 +826,165 @@ public class ProfileComparer extends CanonicalResourceComparer { return session.getContext().fetchResource(ValueSet.class, vsRef); } + public XhtmlNode renderStructure(ProfileComparison comp, String id, String prefix, String corePath) throws FHIRException, IOException { + HierarchicalTableGenerator gen = new HierarchicalTableGenerator(Utilities.path("[tmp]", "compare"), false, true); + gen.setTranslator(session.getContext().translator()); + TableModel model = gen.initComparisonTable(corePath, id); + genElementComp(null /* oome back to this later */, gen, model.getRows(), comp.combined, corePath, prefix, null, true); + return gen.generate(model, prefix, 0, null); + } + + private void genElementComp(String defPath, HierarchicalTableGenerator gen, List rows, StructuralMatch combined, String corePath, String prefix, Row slicingRow, boolean root) throws IOException { + Row originalRow = slicingRow; + Row typesRow = null; + + List> children = combined.getChildren(); + + Row row = gen.new Row(); + rows.add(row); + String path = combined.either().getPath(); + row.setAnchor(path); + row.setColor(utils.getRowColor(combined.either(), false)); + if (eitherHasSlicing(combined)) + row.setLineColor(1); + else if (eitherHasSliceName(combined)) + row.setLineColor(2); + else + row.setLineColor(0); + boolean ext = false; + if (tail(path).equals("extension")) { + if (elementIsComplex(combined)) + row.setIcon("icon_extension_complex.png", HierarchicalTableGenerator.TEXT_ICON_EXTENSION_COMPLEX); + else + row.setIcon("icon_extension_simple.png", HierarchicalTableGenerator.TEXT_ICON_EXTENSION_SIMPLE); + ext = true; + } else if (tail(path).equals("modifierExtension")) { + if (elementIsComplex(combined)) + row.setIcon("icon_modifier_extension_complex.png", HierarchicalTableGenerator.TEXT_ICON_EXTENSION_COMPLEX); + else + row.setIcon("icon_modifier_extension_simple.png", HierarchicalTableGenerator.TEXT_ICON_EXTENSION_SIMPLE); + } else if (hasChoice(combined)) { + if (allAreReference(combined)) + row.setIcon("icon_reference.png", HierarchicalTableGenerator.TEXT_ICON_REFERENCE); + else { + row.setIcon("icon_choice.gif", HierarchicalTableGenerator.TEXT_ICON_CHOICE); + typesRow = row; + } + } else if (combined.either().hasContentReference()) + row.setIcon("icon_reuse.png", HierarchicalTableGenerator.TEXT_ICON_REUSE); + else if (isPrimitive(combined)) + row.setIcon("icon_primitive.png", HierarchicalTableGenerator.TEXT_ICON_PRIMITIVE); + else if (hasTarget(combined)) + row.setIcon("icon_reference.png", HierarchicalTableGenerator.TEXT_ICON_REFERENCE); + else if (isDataType(combined)) + row.setIcon("icon_datatype.gif", HierarchicalTableGenerator.TEXT_ICON_DATATYPE); + else + row.setIcon("icon_resource.png", HierarchicalTableGenerator.TEXT_ICON_RESOURCE); + String ref = defPath == null ? null : defPath + combined.either().getId(); + String sName = tail(path); + String sn = getSliceName(combined); + if (sn != null) + sName = sName +":"+sn; + UnusedTracker used = new UnusedTracker(); + Cell nc; + String leftColor = !combined.hasLeft() ? COLOR_NO_ROW_LEFT : combined.hasErrors() ? COLOR_DIFFERENT : null; + String rightColor = !combined.hasRight() ? COLOR_NO_ROW_LEFT : combined.hasErrors() ? COLOR_DIFFERENT : null; + if (combined.hasLeft()) { + nc = utils.genElementNameCell(gen, combined.getLeft(), "??", true, corePath, prefix, root, false, false, null, typesRow, row, false, ext, used , ref, sName); + } else { + nc = utils.genElementNameCell(gen, combined.getRight(), "??", true, corePath, prefix, root, false, false, null, typesRow, row, false, ext, used , ref, sName); + } + if (combined.hasLeft()) { + frame(utils.genElementCells(gen, combined.getLeft(), "??", true, corePath, prefix, root, false, false, null, typesRow, row, false, ext, used , ref, sName, nc), leftColor); + } else { + frame(spacers(row, 4, gen), leftColor); + } + if (combined.hasRight()) { + frame(utils.genElementCells(gen, combined.getRight(), "??", true, corePath, prefix, root, false, false, null, typesRow, row, false, ext, used, ref, sName, nc), rightColor); + } else { + frame(spacers(row, 4, gen), rightColor); + } + row.getCells().add(cellForMessages(gen, combined.getMessages())); + + for (StructuralMatch child : children) { + genElementComp(defPath, gen, row.getSubRows(), child, corePath, prefix, originalRow, false); + } + } + + private void frame(List cells, String color) { + for (Cell cell : cells) { + if (color != null) { + cell.setStyle("background-color: "+color); + } + } + cells.get(0).setStyle("border-left: 1px grey solid"+(color == null ? "" : "; background-color: "+color)); + cells.get(cells.size()-1).setStyle("border-right: 1px grey solid"+(color == null ? "" : "; background-color: "+color)); + } + + private List spacers(Row row, int count, HierarchicalTableGenerator gen) { + List res = new ArrayList<>(); + for (int i = 0; i < count; i++) { + Cell c = gen.new Cell(); + res.add(c); + row.getCells().add(c); + } + return res; + } + + private String getSliceName(StructuralMatch combined) { + // TODO Auto-generated method stub + return null; + } + + private boolean isDataType(StructuralMatch combined) { + // TODO Auto-generated method stub + return false; + } + + private boolean hasTarget(StructuralMatch combined) { + // TODO Auto-generated method stub + return false; + } + + private boolean isPrimitive(StructuralMatch combined) { + // TODO Auto-generated method stub + return false; + } + + private boolean allAreReference(StructuralMatch combined) { + // TODO Auto-generated method stub + return false; + } + + private boolean hasChoice(StructuralMatch combined) { + // TODO Auto-generated method stub + return false; + } + + private boolean elementIsComplex(StructuralMatch combined) { + // TODO Auto-generated method stub velement.hasType() && element.getType().get(0).hasProfile() && extensionIsComplex(element.getType().get(0).getProfile().get(0).getValue() + return false; + } + + private boolean eitherHasSliceName(StructuralMatch combined) { + // TODO Auto-generated method stub + return false; + } + + private boolean eitherHasSlicing(StructuralMatch combined) { + // TODO Auto-generated method stub + return false; + } - + + + +private String tail(String path) { + if (path.contains(".")) + return path.substring(path.lastIndexOf('.')+1); + else + return path; +} } \ No newline at end of file diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/ResourceComparer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/ResourceComparer.java index af9d196e5..09595455c 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/ResourceComparer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/ResourceComparer.java @@ -47,9 +47,7 @@ public class ResourceComparer { return id; } - public void setId(String id) { - this.id = abbreviation()+"-"+id; - } + protected abstract String summary(); } public final static String COLOR_NO_ROW_LEFT = "#ffffb3"; @@ -84,6 +82,7 @@ public class ResourceComparer { XhtmlNode tbl = div.table("grid"); for (ValidationMessage vm : csc.messages) { XhtmlNode tr = tbl.tr(); + tr.style("background-color: "+colorForLevel(vm.getLevel())); tr.td().tx(vm.getLocation()); tr.td().tx(vm.getMessage()); tr.td().tx(vm.getLevel().getDisplay()); diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/StructuralMatch.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/StructuralMatch.java index a37e374e1..26933c697 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/StructuralMatch.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/StructuralMatch.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import org.hl7.fhir.utilities.validation.ValidationMessage; +import org.hl7.fhir.utilities.validation.ValidationMessage.IssueSeverity; public class StructuralMatch { @@ -77,5 +78,14 @@ public class StructuralMatch { return messages; } + public boolean hasErrors() { + for (ValidationMessage vm : messages) { + if (vm.getLevel() == IssueSeverity.ERROR) { + return true; + } + } + return false; + } + } \ No newline at end of file diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/ValueSetComparer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/ValueSetComparer.java index 27cd01240..f8e48b143 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/ValueSetComparer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/ValueSetComparer.java @@ -60,7 +60,12 @@ public class ValueSetComparer extends CanonicalResourceComparer { @Override protected String abbreviation() { - return "sd"; + return "vs"; + } + + @Override + protected String summary() { + return "ValueSet: "+left.present()+" vs "+right.present(); } } diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java index ecbb57dc1..285e5ee16 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java @@ -286,7 +286,7 @@ public class ProfileUtilities extends TranslatingUtilities { this.pkp = pkp; } - private class UnusedTracker { + public static class UnusedTracker { private boolean used; } @@ -3219,7 +3219,7 @@ public class ProfileUtilities extends TranslatingUtilities { return (!min.hasValue() ? "" : Integer.toString(min.getValue())) + ".." + (!max.hasValue() ? "" : max.getValue()); } - private void genCardinality(HierarchicalTableGenerator gen, ElementDefinition definition, Row row, boolean hasDef, UnusedTracker tracker, ElementDefinition fallback) { + private Cell genCardinality(HierarchicalTableGenerator gen, ElementDefinition definition, Row row, boolean hasDef, UnusedTracker tracker, ElementDefinition fallback) { IntegerType min = !hasDef ? new IntegerType() : definition.hasMinElement() ? definition.getMinElement() : new IntegerType(); StringType max = !hasDef ? new StringType() : definition.hasMaxElement() ? definition.getMaxElement() : new StringType(); if (min.isEmpty() && definition.getUserData(DERIVATION_POINTER) != null) { @@ -3249,8 +3249,9 @@ public class ProfileUtilities extends TranslatingUtilities { if (!min.isEmpty() || !max.isEmpty()) { cell.addPiece(checkForNoChange(min, gen.new Piece(null, !min.hasValue() ? "" : Integer.toString(min.getValue()), null))); cell.addPiece(checkForNoChange(min, max, gen.new Piece(null, "..", null))); - cell.addPiece(checkForNoChange(min, gen.new Piece(null, !max.hasValue() ? "" : max.getValue(), null))); + cell.addPiece(checkForNoChange(max, gen.new Piece(null, !max.hasValue() ? "" : max.getValue(), null))); } + return cell; } @@ -3393,13 +3394,9 @@ public class ProfileUtilities extends TranslatingUtilities { private Row genElement(String defPath, HierarchicalTableGenerator gen, List rows, ElementDefinition element, List all, List profiles, boolean showMissing, String profileBaseFileName, Boolean extensions, boolean snapshot, String corePath, String imagePath, boolean root, boolean logicalModel, boolean isConstraintMode, boolean allInvariants, Row slicingRow) throws IOException, FHIRException { Row originalRow = slicingRow; StructureDefinition profile = profiles == null ? null : profiles.get(profiles.size()-1); - String s = tail(element.getPath()); - if (element.hasSliceName()) - s = s +":"+element.getSliceName(); Row typesRow = null; List children = getChildren(all, element); - boolean isExtension = (s.equals("extension") || s.equals("modifierExtension")); // if (!snapshot && isExtension && extensions != null && extensions != isExtension) // return; @@ -3449,71 +3446,16 @@ public class ProfileUtilities extends TranslatingUtilities { row.setIcon("icon_datatype.gif", HierarchicalTableGenerator.TEXT_ICON_DATATYPE); else row.setIcon("icon_resource.png", HierarchicalTableGenerator.TEXT_ICON_RESOURCE); - String ref = defPath == null ? null : defPath + element.getId(); UnusedTracker used = new UnusedTracker(); + String ref = defPath == null ? null : defPath + element.getId(); + String sName = tail(element.getPath()); + if (element.hasSliceName()) + sName = sName +":"+element.getSliceName(); used.used = true; if (logicalModel && element.hasRepresentation(PropertyRepresentation.XMLATTR)) - s = "@"+s; - String hint = ""; - hint = checkAdd(hint, (element.hasSliceName() ? translate("sd.table", "Slice")+" "+element.getSliceName() : "")); - if (hasDef && element.hasDefinition()) { - hint = checkAdd(hint, (hasDef && element.hasSliceName() ? ": " : "")); - hint = checkAdd(hint, !hasDef ? null : gt(element.getDefinitionElement())); - } - Cell left = gen.new Cell(null, ref, s, hint, null); - row.getCells().add(left); - Cell gc = gen.new Cell(); - row.getCells().add(gc); - if (element != null && element.getIsModifier()) - checkForNoChange(element.getIsModifierElement(), gc.addStyledText(translate("sd.table", "This element is a modifier element"), "?!", null, null, null, false)); - if (element != null && element.getMustSupport()) - checkForNoChange(element.getMustSupportElement(), gc.addStyledText(translate("sd.table", "This element must be supported"), "S", "white", "red", null, false)); - if (element != null && element.getIsSummary()) - checkForNoChange(element.getIsSummaryElement(), gc.addStyledText(translate("sd.table", "This element is included in summaries"), "\u03A3", null, null, null, false)); - if (element != null && (!element.getConstraint().isEmpty() || !element.getCondition().isEmpty())) - gc.addStyledText(translate("sd.table", "This element has or is affected by some invariants ("+listConstraintsAndConditions(element)+")"), "I", null, null, null, false); - - ExtensionContext extDefn = null; - if (ext) { - if (element != null && element.getType().size() == 1 && element.getType().get(0).hasProfile()) { - String eurl = element.getType().get(0).getProfile().get(0).getValue(); - extDefn = locateExtension(StructureDefinition.class, eurl); - if (extDefn == null) { - genCardinality(gen, element, row, hasDef, used, null); - row.getCells().add(gen.new Cell(null, null, "?gen-e1? "+element.getType().get(0).getProfile(), null, null)); - generateDescription(gen, row, element, (ElementDefinition) element.getUserData(DERIVATION_POINTER), used.used, profile.getUrl(), eurl, profile, corePath, imagePath, root, logicalModel, allInvariants, snapshot); - } else { - String name = urltail(eurl); - left.getPieces().get(0).setText(name); - // left.getPieces().get(0).setReference((String) extDefn.getExtensionStructure().getTag("filename")); - left.getPieces().get(0).setHint(translate("sd.table", "Extension URL")+" = "+extDefn.getUrl()); - genCardinality(gen, element, row, hasDef, used, extDefn.getElement()); - ElementDefinition valueDefn = extDefn.getExtensionValueDefinition(); - if (valueDefn != null && !"0".equals(valueDefn.getMax())) - genTypes(gen, row, valueDefn, profileBaseFileName, profile, corePath, imagePath, root); - else // if it's complex, we just call it nothing - // genTypes(gen, row, extDefn.getSnapshot().getElement().get(0), profileBaseFileName, profile); - row.getCells().add(gen.new Cell(null, null, "("+translate("sd.table", "Complex")+")", null, null)); - generateDescription(gen, row, element, extDefn.getElement(), used.used, null, extDefn.getUrl(), profile, corePath, imagePath, root, logicalModel, allInvariants, valueDefn, snapshot); - } - } else { - genCardinality(gen, element, row, hasDef, used, null); - if ("0".equals(element.getMax())) - row.getCells().add(gen.new Cell()); - else - genTypes(gen, row, element, profileBaseFileName, profile, corePath, imagePath, root); - generateDescription(gen, row, element, (ElementDefinition) element.getUserData(DERIVATION_POINTER), used.used, null, null, profile, corePath, imagePath, root, logicalModel, allInvariants, snapshot); - } - } else { - genCardinality(gen, element, row, hasDef, used, null); - if (element.hasSlicing()) - row.getCells().add(gen.new Cell(null, corePath+"profiling.html#slicing", "(Slice Definition)", null, null)); - else if (hasDef && !"0".equals(element.getMax()) && typesRow == null) - genTypes(gen, row, element, profileBaseFileName, profile, corePath, imagePath, root); - else - row.getCells().add(gen.new Cell()); - generateDescription(gen, row, element, (ElementDefinition) element.getUserData(DERIVATION_POINTER), used.used, null, null, profile, corePath, imagePath, root, logicalModel, allInvariants, snapshot); - } + sName = "@"+sName; + Cell nc = genElementNameCell(gen, element, profileBaseFileName, snapshot, corePath, imagePath, root, logicalModel, allInvariants, profile, typesRow, row, hasDef, ext, used, ref, sName); + genElementCells(gen, element, profileBaseFileName, snapshot, corePath, imagePath, root, logicalModel, allInvariants, profile, typesRow, row, hasDef, ext, used, ref, sName, nc); if (element.hasSlicing()) { if (standardExtensionSlicing(element)) { used.used = true; // doesn't matter whether we have a type, we're used if we're setting up slicing ... element.hasType() && element.getType().get(0).hasProfile(); @@ -3545,7 +3487,7 @@ public class ProfileUtilities extends TranslatingUtilities { hrow.setColor(getRowColor(element, isConstraintMode)); hrow.setLineColor(1); hrow.setIcon("icon_element.gif", HierarchicalTableGenerator.TEXT_ICON_ELEMENT); - hrow.getCells().add(gen.new Cell(null, null, s+":All Slices", "", null)); + hrow.getCells().add(gen.new Cell(null, null, sName+":All Slices", "", null)); hrow.getCells().add(gen.new Cell()); hrow.getCells().add(gen.new Cell()); hrow.getCells().add(gen.new Cell()); @@ -3560,7 +3502,7 @@ public class ProfileUtilities extends TranslatingUtilities { hrow.setColor(getRowColor(element, isConstraintMode)); hrow.setLineColor(1); hrow.setIcon("icon_element.gif", HierarchicalTableGenerator.TEXT_ICON_ELEMENT); - hrow.getCells().add(gen.new Cell(null, null, s+":All Types", "", null)); + hrow.getCells().add(gen.new Cell(null, null, sName+":All Types", "", null)); hrow.getCells().add(gen.new Cell()); hrow.getCells().add(gen.new Cell()); hrow.getCells().add(gen.new Cell()); @@ -3569,7 +3511,8 @@ public class ProfileUtilities extends TranslatingUtilities { row = hrow; } - Row currRow = row; + Row currRow = row; + boolean isExtension = Utilities.existsInList(tail(element.getPath()), "extension", "modifierExtension"); for (ElementDefinition child : children) { if (!child.hasSliceName()) currRow = row; @@ -3588,6 +3531,85 @@ public class ProfileUtilities extends TranslatingUtilities { return slicingRow; } + public Cell genElementNameCell(HierarchicalTableGenerator gen, ElementDefinition element, String profileBaseFileName, boolean snapshot, String corePath, + String imagePath, boolean root, boolean logicalModel, boolean allInvariants, StructureDefinition profile, Row typesRow, Row row, boolean hasDef, + boolean ext, UnusedTracker used, String ref, String sName) throws IOException { + String hint = ""; + hint = checkAdd(hint, (element.hasSliceName() ? translate("sd.table", "Slice")+" "+element.getSliceName() : "")); + if (hasDef && element.hasDefinition()) { + hint = checkAdd(hint, (hasDef && element.hasSliceName() ? ": " : "")); + hint = checkAdd(hint, !hasDef ? null : gt(element.getDefinitionElement())); + } + Cell left = gen.new Cell(null, ref, sName, hint, null); + row.getCells().add(left); + return left; + } + + public List genElementCells(HierarchicalTableGenerator gen, ElementDefinition element, String profileBaseFileName, boolean snapshot, String corePath, + String imagePath, boolean root, boolean logicalModel, boolean allInvariants, StructureDefinition profile, Row typesRow, Row row, boolean hasDef, + boolean ext, UnusedTracker used, String ref, String sName, Cell nameCell) throws IOException { + List res = new ArrayList<>(); + Cell gc = gen.new Cell(); + row.getCells().add(gc); + res.add(gc); + if (element != null && element.getIsModifier()) + checkForNoChange(element.getIsModifierElement(), gc.addStyledText(translate("sd.table", "This element is a modifier element"), "?!", null, null, null, false)); + if (element != null && element.getMustSupport()) + checkForNoChange(element.getMustSupportElement(), gc.addStyledText(translate("sd.table", "This element must be supported"), "S", "white", "red", null, false)); + if (element != null && element.getIsSummary()) + checkForNoChange(element.getIsSummaryElement(), gc.addStyledText(translate("sd.table", "This element is included in summaries"), "\u03A3", null, null, null, false)); + if (element != null && (!element.getConstraint().isEmpty() || !element.getCondition().isEmpty())) + gc.addStyledText(translate("sd.table", "This element has or is affected by some invariants ("+listConstraintsAndConditions(element)+")"), "I", null, null, null, false); + + ExtensionContext extDefn = null; + if (ext) { + if (element != null && element.getType().size() == 1 && element.getType().get(0).hasProfile()) { + String eurl = element.getType().get(0).getProfile().get(0).getValue(); + extDefn = locateExtension(StructureDefinition.class, eurl); + if (extDefn == null) { + res.add(genCardinality(gen, element, row, hasDef, used, null)); + res.add(addCell(row, gen.new Cell(null, null, "?gen-e1? "+element.getType().get(0).getProfile(), null, null))); + res.add(generateDescription(gen, row, element, (ElementDefinition) element.getUserData(DERIVATION_POINTER), used.used, profile.getUrl(), eurl, profile, corePath, imagePath, root, logicalModel, allInvariants, snapshot)); + } else { + String name = urltail(eurl); + nameCell.getPieces().get(0).setText(name); + // left.getPieces().get(0).setReference((String) extDefn.getExtensionStructure().getTag("filename")); + nameCell.getPieces().get(0).setHint(translate("sd.table", "Extension URL")+" = "+extDefn.getUrl()); + res.add(genCardinality(gen, element, row, hasDef, used, extDefn.getElement())); + ElementDefinition valueDefn = extDefn.getExtensionValueDefinition(); + if (valueDefn != null && !"0".equals(valueDefn.getMax())) + res.add(genTypes(gen, row, valueDefn, profileBaseFileName, profile, corePath, imagePath, root)); + else // if it's complex, we just call it nothing + // genTypes(gen, row, extDefn.getSnapshot().getElement().get(0), profileBaseFileName, profile); + res.add(addCell(row, gen.new Cell(null, null, "("+translate("sd.table", "Complex")+")", null, null))); + res.add(generateDescription(gen, row, element, extDefn.getElement(), used.used, null, extDefn.getUrl(), profile, corePath, imagePath, root, logicalModel, allInvariants, valueDefn, snapshot)); + } + } else { + res.add(genCardinality(gen, element, row, hasDef, used, null)); + if ("0".equals(element.getMax())) + res.add(addCell(row, gen.new Cell())); + else + res.add(genTypes(gen, row, element, profileBaseFileName, profile, corePath, imagePath, root)); + res.add(generateDescription(gen, row, element, (ElementDefinition) element.getUserData(DERIVATION_POINTER), used.used, null, null, profile, corePath, imagePath, root, logicalModel, allInvariants, snapshot)); + } + } else { + res.add(genCardinality(gen, element, row, hasDef, used, null)); + if (element.hasSlicing()) + res.add(addCell(row, gen.new Cell(null, corePath+"profiling.html#slicing", "(Slice Definition)", null, null))); + else if (hasDef && !"0".equals(element.getMax()) && typesRow == null) + res.add(genTypes(gen, row, element, profileBaseFileName, profile, corePath, imagePath, root)); + else + res.add(addCell(row, gen.new Cell())); + res.add(generateDescription(gen, row, element, (ElementDefinition) element.getUserData(DERIVATION_POINTER), used.used, null, null, profile, corePath, imagePath, root, logicalModel, allInvariants, snapshot)); + } + return res; + } + + private Cell addCell(Row row, Cell cell) { + row.getCells().add(cell); + return (cell); + } + private String checkAdd(String src, String app) { return app == null ? src : src + app; } @@ -3800,7 +3822,7 @@ public class ProfileUtilities extends TranslatingUtilities { } - private String getRowColor(ElementDefinition element, boolean isConstraintMode) { + public String getRowColor(ElementDefinition element, boolean isConstraintMode) { switch (element.getUserInt(UD_ERROR_STATUS)) { case STATUS_HINT: return ROW_COLOR_HINT; case STATUS_WARNING: return ROW_COLOR_WARNING; @@ -3849,7 +3871,12 @@ public class ProfileUtilities extends TranslatingUtilities { c.getPieces().add(gen.new Piece(null, ToolingExtensions.readStringExtension(definition, "http://hl7.org/fhir/StructureDefinition/elementdefinition-namespace"), null)); } } - + if (root) { + if (profile.getAbstract()) { + if (!c.getPieces().isEmpty()) c.addPiece(gen.new Piece("br")); + c.addPiece(gen.new Piece(null, "This is an abstract profile", null)); + } + } if (definition.getPath().endsWith("url") && definition.hasFixed()) { c.getPieces().add(checkForNoChange(definition.getFixed(), gen.new Piece(null, "\""+buildJson(definition.getFixed())+"\"", null).addStyle("color: darkgreen"))); } else { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/DefinitionNavigator.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/DefinitionNavigator.java index f659b1014..645c5f610 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/DefinitionNavigator.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/DefinitionNavigator.java @@ -201,6 +201,11 @@ public class DefinitionNavigator { public StructureDefinition getStructure() { return structure; } + + @Override + public String toString() { + return current().getId(); + } } \ No newline at end of file diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xhtml/HierarchicalTableGenerator.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xhtml/HierarchicalTableGenerator.java index 7becbe2c5..a69ab1336 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xhtml/HierarchicalTableGenerator.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xhtml/HierarchicalTableGenerator.java @@ -415,6 +415,10 @@ public class HierarchicalTableGenerator extends TranslatingUtilities { this.span = span; } + public Title setStyle(String value) { + super.setStyle(value); + return this; + } } public class Row { @@ -569,6 +573,26 @@ public class HierarchicalTableGenerator extends TranslatingUtilities { return model; } + public TableModel initComparisonTable(String prefix, String id) { + TableModel model = new TableModel(id, true); + + model.setAlternating(true); + model.setDocoImg(prefix+"help16.png"); + model.setDocoRef(prefix+"formats.html#table"); + model.getTitles().add(new Title(null, model.getDocoRef(), translate("sd.head", "Name"), translate("sd.hint", "The logical name of the element"), null, 0)); + model.getTitles().add(new Title(null, model.getDocoRef(), translate("sd.head", "L Flags"), translate("sd.hint", "Information about the use of the element - Left Structure"), null, 0).setStyle("border-left: 1px grey solid")); + model.getTitles().add(new Title(null, model.getDocoRef(), translate("sd.head", "L Card."), translate("sd.hint", "Minimum and Maximum # of times the the element can appear in the instance - Left Structure"), null, 0)); + model.getTitles().add(new Title(null, model.getDocoRef(), translate("sd.head", "L Type"), translate("sd.hint", "Reference to the type of the element - Left Structure"), null, 100)); + model.getTitles().add(new Title(null, model.getDocoRef(), translate("sd.head", "L Description & Constraints"), translate("sd.hint", "Additional information about the element - Left Structure"), null, 0).setStyle("border-right: 1px grey solid")); + model.getTitles().add(new Title(null, model.getDocoRef(), translate("sd.head", "R Flags"), translate("sd.hint", "Information about the use of the element - Left Structure"), null, 0).setStyle("border-left: 1px grey solid")); + model.getTitles().add(new Title(null, model.getDocoRef(), translate("sd.head", "R Card."), translate("sd.hint", "Minimum and Maximum # of times the the element can appear in the instance - Left Structure"), null, 0)); + model.getTitles().add(new Title(null, model.getDocoRef(), translate("sd.head", "L Type"), translate("sd.hint", "Reference to the type of the element - Left Structure"), null, 100)); + model.getTitles().add(new Title(null, model.getDocoRef(), translate("sd.head", "L Description & Constraints"), translate("sd.hint", "Additional information about the element - Left Structure"), null, 0).setStyle("border-right: 1px grey solid")); + model.getTitles().add(new Title(null, model.getDocoRef(), translate("sd.head", "Comments"), translate("sd.hint", "Comments about the comparison"), null, 0)); + return model; + } + + public TableModel initGridTable(String prefix, String id) { TableModel model = new TableModel(id, false); diff --git a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/comparison/tests/ComparisonTests.java b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/comparison/tests/ComparisonTests.java index 2c8576cc8..174ca7bef 100644 --- a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/comparison/tests/ComparisonTests.java +++ b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/comparison/tests/ComparisonTests.java @@ -14,8 +14,11 @@ import org.hl7.fhir.exceptions.FHIRFormatError; import org.hl7.fhir.r5.comparison.CodeSystemComparer; import org.hl7.fhir.r5.comparison.CodeSystemComparer.CodeSystemComparison; import org.hl7.fhir.r5.comparison.ComparisonSession; +import org.hl7.fhir.r5.comparison.ProfileComparer; +import org.hl7.fhir.r5.comparison.ProfileComparer.ProfileComparison; import org.hl7.fhir.r5.comparison.ValueSetComparer; import org.hl7.fhir.r5.comparison.ValueSetComparer.ValueSetComparison; +import org.hl7.fhir.r5.conformance.ProfileUtilities; import org.hl7.fhir.r5.context.IWorkerContext; import org.hl7.fhir.r5.formats.IParser.OutputStyle; import org.hl7.fhir.r5.formats.JsonParser; @@ -24,6 +27,7 @@ import org.hl7.fhir.r5.model.CanonicalResource; import org.hl7.fhir.r5.model.CodeSystem; import org.hl7.fhir.r5.model.Constants; import org.hl7.fhir.r5.model.Resource; +import org.hl7.fhir.r5.model.StructureDefinition; import org.hl7.fhir.r5.model.ValueSet; import org.hl7.fhir.r5.test.utils.TestingUtilities; import org.hl7.fhir.utilities.TextFile; @@ -103,7 +107,7 @@ public class ComparisonTests { System.out.println("---- Set up Output ----------------------------------------------------------"); Utilities.createDirectory(Utilities.path("[tmp]", "comparison")); FilesystemPackageCacheManager pcm = new FilesystemPackageCacheManager(true, ToolsVersion.TOOLS_VERSION); - NpmPackage npm = pcm.loadPackage("hl7.fhir.pubpack", "0.0.5"); + NpmPackage npm = pcm.loadPackage("hl7.fhir.pubpack", "0.0.6"); for (String f : npm.list("other")) { TextFile.streamToFile(npm.load("other", f), Utilities.path("[tmp]", "comparison", f)); } @@ -112,7 +116,7 @@ public class ComparisonTests { CanonicalResource left = load("left"); CanonicalResource right = load("right"); - ComparisonSession session = new ComparisonSession(context); + ComparisonSession session = new ComparisonSession(context, "Comparison Tests"); if (left instanceof CodeSystem && right instanceof CodeSystem) { CodeSystemComparer cs = new CodeSystemComparer(session); @@ -138,11 +142,31 @@ public class ComparisonTests { String xml3 = new XhtmlComposer(true).compose(cs.renderExpansion(csc, "", "")); TextFile.stringToFile(HEADER + hd("Messages") + xmle + BREAK + hd("Metadata") + xml1 + BREAK + hd("Definition") + xml2 + BREAK + hd("Expansion") + xml3 + FOOTER, Utilities.path("[tmp]", "comparison", name + ".html")); checkOutcomes(csc.getMessages(), content); + } else if (left instanceof StructureDefinition && right instanceof StructureDefinition) { + ProfileUtilities utils = new ProfileUtilities(context, null, null); + genSnapshot(utils, (StructureDefinition) left); + genSnapshot(utils, (StructureDefinition) right); + ProfileComparer pc = new ProfileComparer(session, utils); + ProfileComparison csc = pc.compare((StructureDefinition) left, (StructureDefinition) right); + new org.hl7.fhir.r5.formats.JsonParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path("[tmp]", "comparison", name + "-union.json")), csc.getUnion()); + new org.hl7.fhir.r5.formats.JsonParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path("[tmp]", "comparison", name + "-intersection.json")), csc.getIntersection()); + + String xmle = new XhtmlComposer(true).compose(pc.renderErrors(csc)); + String xml1 = new XhtmlComposer(true).compose(pc.renderMetadata(csc, "", "")); + String xml2 = new XhtmlComposer(true).compose(pc.renderStructure(csc, "", "", "http://hl7.org/fhir")); +// String xml3 = new XhtmlComposer(true).compose(cs.renderExpansion(csc, "", "")); + TextFile.stringToFile(HEADER + hd("Messages") + xmle + BREAK + hd("Metadata") + xml1 + BREAK + hd("Structure") + xml2 + FOOTER, Utilities.path("[tmp]", "comparison", name + ".html")); + checkOutcomes(csc.getMessages(), content); } else { throw new FHIRException("Can't compare " + left.fhirType() + " to " + right.fhirType()); } } + private void genSnapshot(ProfileUtilities utils, StructureDefinition sd) { + StructureDefinition base = context.fetchTypeDefinition(sd.getType()); + utils.generateSnapshot(base, sd, sd.getUrl(), "http://hl7.org/fhir/r4", sd.present()); + } + private String hd(String text) { return "

    " + text + "

    \r\n"; }