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

Merge pull request #1751 from hapifhir/2024-09-gg-model 

2024 09 gg model
This commit is contained in:
Grahame Grieve 2024-09-19 08:37:16 +10:00 committed by GitHub
parent 9a7a843a20 eab8276753
commit 79ef48ba96
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 121 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_40/resources30_40/Consent30_40.java
View File

@ -47,7 +47,7 @@ public class Consent30_40 {
tgt.setPolicyRule(new CodeableConcept(c));
}
if (src.hasSecurityLabel() || src.hasPeriod() || src.hasActor() || src.hasAction() || src.hasPurpose() || src.hasDataPeriod() || src.hasData() || src.hasExcept()) {
org.hl7.fhir.r4.model.Consent.provisionComponent pc = new org.hl7.fhir.r4.model.Consent.provisionComponent();
org.hl7.fhir.r4.model.Consent.ProvisionComponent pc = new org.hl7.fhir.r4.model.Consent.ProvisionComponent();
if (src.hasPeriod())
pc.setPeriod(Period30_40.convertPeriod(src.getPeriod()));
for (org.hl7.fhir.dstu3.model.Consent.ConsentActorComponent t : src.getActor())
@ -104,7 +104,7 @@ public class Consent30_40 {
}
}
if (src.hasProvision()) {
org.hl7.fhir.r4.model.Consent.provisionComponent p = src.getProvision();
org.hl7.fhir.r4.model.Consent.ProvisionComponent p = src.getProvision();
if (p.hasPeriod())
tgt.setPeriod(Period30_40.convertPeriod(p.getPeriod()));
for (org.hl7.fhir.r4.model.Consent.provisionActorComponent t : p.getActor())
@ -117,7 +117,7 @@ public class Consent30_40 {
tgt.setDataPeriod(Period30_40.convertPeriod(p.getDataPeriod()));
for (org.hl7.fhir.r4.model.Consent.provisionDataComponent t : p.getData())
tgt.addData(convertConsentDataComponent(t));
for (org.hl7.fhir.r4.model.Consent.provisionComponent t : p.getProvision())
for (org.hl7.fhir.r4.model.Consent.ProvisionComponent t : p.getProvision())
tgt.addExcept(convertExceptComponent(t));
}
return tgt;
@ -369,7 +369,7 @@ public class Consent30_40 {
return tgt;
}
static public org.hl7.fhir.dstu3.model.Consent.ExceptComponent convertExceptComponent(org.hl7.fhir.r4.model.Consent.provisionComponent src) throws FHIRException {
static public org.hl7.fhir.dstu3.model.Consent.ExceptComponent convertExceptComponent(org.hl7.fhir.r4.model.Consent.ProvisionComponent src) throws FHIRException {
if (src == null)
return null;
org.hl7.fhir.dstu3.model.Consent.ExceptComponent tgt = new org.hl7.fhir.dstu3.model.Consent.ExceptComponent();
@ -393,10 +393,10 @@ public class Consent30_40 {
return tgt;
}
static public org.hl7.fhir.r4.model.Consent.provisionComponent convertExceptComponent(org.hl7.fhir.dstu3.model.Consent.ExceptComponent src) throws FHIRException {
static public org.hl7.fhir.r4.model.Consent.ProvisionComponent convertExceptComponent(org.hl7.fhir.dstu3.model.Consent.ExceptComponent src) throws FHIRException {
if (src == null)
return null;
org.hl7.fhir.r4.model.Consent.provisionComponent tgt = new org.hl7.fhir.r4.model.Consent.provisionComponent();
org.hl7.fhir.r4.model.Consent.ProvisionComponent tgt = new org.hl7.fhir.r4.model.Consent.ProvisionComponent();
ConversionContext30_40.INSTANCE.getVersionConvertor_30_40().copyBackboneElement(src,tgt);
if (src.hasType())
tgt.setTypeElement(convertConsentExceptType(src.getTypeElement()));

8
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/resources40_50/Consent40_50.java
View File

@ -220,7 +220,7 @@ public class Consent40_50 {
return tgt;
}
public static org.hl7.fhir.r5.model.Consent.ProvisionComponent convertprovisionComponent(org.hl7.fhir.r4.model.Consent.provisionComponent src) throws FHIRException {
public static org.hl7.fhir.r5.model.Consent.ProvisionComponent convertprovisionComponent(org.hl7.fhir.r4.model.Consent.ProvisionComponent src) throws FHIRException {
if (src == null)
return null;
org.hl7.fhir.r5.model.Consent.ProvisionComponent tgt = new org.hl7.fhir.r5.model.Consent.ProvisionComponent();
@ -242,15 +242,15 @@ public class Consent40_50 {
tgt.setDataPeriod(Period40_50.convertPeriod(src.getDataPeriod()));
for (org.hl7.fhir.r4.model.Consent.provisionDataComponent t : src.getData())
tgt.addData(convertprovisionDataComponent(t));
for (org.hl7.fhir.r4.model.Consent.provisionComponent t : src.getProvision())
for (org.hl7.fhir.r4.model.Consent.ProvisionComponent t : src.getProvision())
tgt.addProvision(convertprovisionComponent(t));
return tgt;
}
public static org.hl7.fhir.r4.model.Consent.provisionComponent convertprovisionComponent(org.hl7.fhir.r5.model.Consent.ProvisionComponent src) throws FHIRException {
public static org.hl7.fhir.r4.model.Consent.ProvisionComponent convertprovisionComponent(org.hl7.fhir.r5.model.Consent.ProvisionComponent src) throws FHIRException {
if (src == null)
return null;
org.hl7.fhir.r4.model.Consent.provisionComponent tgt = new org.hl7.fhir.r4.model.Consent.provisionComponent();
org.hl7.fhir.r4.model.Consent.ProvisionComponent tgt = new org.hl7.fhir.r4.model.Consent.ProvisionComponent();
ConversionContext40_50.INSTANCE.getVersionConvertor_40_50().copyBackboneElement(src, tgt);
// if (src.hasType())
// tgt.setTypeElement(convertConsentProvisionType(src.getTypeElement()));

7
org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Quantity.java
View File

@ -1,6 +1,7 @@
package org.hl7.fhir.dstu3.model;
import java.math.BigDecimal;
import java.util.ArrayList;
/*
Copyright (c) 2011+, HL7, Inc.
@ -668,12 +669,16 @@ public class Quantity extends Type implements ICompositeType {
public Quantity copy() {
Quantity dst = new Quantity();
copyValues(dst);
return dst;
}
public void copyValues(Quantity dst) {
super.copyValues(dst);
dst.value = value == null ? null : value.copy();
dst.comparator = comparator == null ? null : comparator.copy();
dst.unit = unit == null ? null : unit.copy();
dst.system = system == null ? null : system.copy();
dst.code = code == null ? null : code.copy();
return dst;
}
protected Quantity typedCopy() {

40
org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/model/MedicationAdministrationCopyTest.java Normal file
View File

@ -0,0 +1,40 @@
package org.hl7.fhir.dstu3.model;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
import org.hl7.fhir.dstu3.formats.JsonParser;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
public class MedicationAdministrationCopyTest {
@DisplayName("Test MedicationAdministration copy")
@Test
public void test() throws IOException {
MedicationAdministration beforeCopy = createMedAdminWithDosageDurationExtension();
MedicationAdministration afterCopy = beforeCopy.copy();
System.out.println("---- BEFORE COPY (BEGIN)");
System.out.println(new JsonParser().composeString(beforeCopy));
System.out.println("---- BEFORE COPY (END)");
System.out.println();
System.out.println("---- AFTER COPY (BEGIN)");
System.out.println(new JsonParser().composeString(afterCopy));
System.out.println("---- AFTER COPY (END)");
assertTrue(beforeCopy.equalsDeep(afterCopy));
}
private static MedicationAdministration createMedAdminWithDosageDurationExtension() {
MedicationAdministration resource = new MedicationAdministration();
resource.setId("12345");
var dosage = new MedicationAdministration.MedicationAdministrationDosageComponent();
dosage.setDose((SimpleQuantity) new SimpleQuantity().setValue(40))
.addExtension(new Extension()
.setUrl("http://duration")
.setValue(new Duration().setValue(5340000)));
resource.setDosage(dosage);
return resource;
}
}

12
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/formats/JsonParser.java
View File

@ -8400,15 +8400,15 @@ public class JsonParser extends JsonParserBase {
parseElementProperties(getJObject(json, "_verificationDate"), res.getVerificationDateElement());
}
protected Consent.provisionComponent parseConsentprovisionComponent(JsonObject json, Consent owner)
protected Consent.ProvisionComponent parseConsentprovisionComponent(JsonObject json, Consent owner)
throws IOException, FHIRFormatError {
Consent.provisionComponent res = new Consent.provisionComponent();
Consent.ProvisionComponent res = new Consent.ProvisionComponent();
parseConsentprovisionComponentProperties(json, owner, res);
return res;
}
protected void parseConsentprovisionComponentProperties(JsonObject json, Consent owner,
Consent.provisionComponent res) throws IOException, FHIRFormatError {
Consent.ProvisionComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("type"))
res.setTypeElement(parseEnumeration(json.get("type").getAsString(), Consent.ConsentProvisionType.NULL,
@ -41383,7 +41383,7 @@ public class JsonParser extends JsonParserBase {
}
}
protected void composeConsentprovisionComponent(String name, Consent.provisionComponent element) throws IOException {
protected void composeConsentprovisionComponent(String name, Consent.ProvisionComponent element) throws IOException {
if (element != null) {
open(name);
composeConsentprovisionComponentInner(element);
@ -41391,7 +41391,7 @@ public class JsonParser extends JsonParserBase {
}
}
protected void composeConsentprovisionComponentInner(Consent.provisionComponent element) throws IOException {
protected void composeConsentprovisionComponentInner(Consent.ProvisionComponent element) throws IOException {
composeBackbone(element);
if (element.hasTypeElement()) {
composeEnumerationCore("type", element.getTypeElement(), new Consent.ConsentProvisionTypeEnumFactory(), false);
@ -41454,7 +41454,7 @@ public class JsonParser extends JsonParserBase {
;
if (element.hasProvision()) {
openArray("provision");
for (Consent.provisionComponent e : element.getProvision())
for (Consent.ProvisionComponent e : element.getProvision())
composeConsentprovisionComponent(null, e);
closeArray();
}

2
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/formats/RdfParser.java
View File

@ -4917,7 +4917,7 @@ public class RdfParser extends RdfParserBase {
}
protected void composeConsentprovisionComponent(Complex parent, String parentType, String name,
Consent.provisionComponent element, int index) {
Consent.ProvisionComponent element, int index) {
if (element == null)
return;
Complex t;

12
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/formats/XmlParser.java
View File

@ -6924,9 +6924,9 @@ public class XmlParser extends XmlParserBase {
return true;
}
protected Consent.provisionComponent parseConsentprovisionComponent(XmlPullParser xpp, Consent owner)
protected Consent.ProvisionComponent parseConsentprovisionComponent(XmlPullParser xpp, Consent owner)
throws XmlPullParserException, IOException, FHIRFormatError {
Consent.provisionComponent res = new Consent.provisionComponent();
Consent.ProvisionComponent res = new Consent.ProvisionComponent();
parseBackboneAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
@ -6941,7 +6941,7 @@ public class XmlParser extends XmlParserBase {
}
protected boolean parseConsentprovisionComponentContent(int eventType, XmlPullParser xpp, Consent owner,
Consent.provisionComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
Consent.ProvisionComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
res.setTypeElement(
parseEnumeration(xpp, Consent.ConsentProvisionType.NULL, new Consent.ConsentProvisionTypeEnumFactory()));
@ -34008,7 +34008,7 @@ public class XmlParser extends XmlParserBase {
}
}
protected void composeConsentprovisionComponent(String name, Consent.provisionComponent element) throws IOException {
protected void composeConsentprovisionComponent(String name, Consent.ProvisionComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
@ -34018,7 +34018,7 @@ public class XmlParser extends XmlParserBase {
}
}
protected void composeConsentprovisionComponentElements(Consent.provisionComponent element) throws IOException {
protected void composeConsentprovisionComponentElements(Consent.ProvisionComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasTypeElement())
composeEnumeration("type", element.getTypeElement(), new Consent.ConsentProvisionTypeEnumFactory());
@ -34057,7 +34057,7 @@ public class XmlParser extends XmlParserBase {
composeConsentprovisionDataComponent("data", e);
}
if (element.hasProvision()) {
for (Consent.provisionComponent e : element.getProvision())
for (Consent.ProvisionComponent e : element.getProvision())
composeConsentprovisionComponent("provision", e);
}
}

104
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Consent.java
View File

@ -1221,7 +1221,7 @@ public class Consent extends DomainResource {
}
@Block()
public static class provisionComponent extends BackboneElement implements IBaseBackboneElement {
public static class ProvisionComponent extends BackboneElement implements IBaseBackboneElement {
/**
* Action to take - permit or deny - when the rule conditions are met. Not
* permitted in root rule, required in all nested rules.
@ -1314,16 +1314,16 @@ public class Consent extends DomainResource {
* Rules which provide exceptions to the base rule or subrules.
*/
@Child(name = "provision", type = {
provisionComponent.class }, order = 11, min = 0, max = Child.MAX_UNLIMITED, modifier = false, summary = false)
ProvisionComponent.class }, order = 11, min = 0, max = Child.MAX_UNLIMITED, modifier = false, summary = false)
@Description(shortDefinition = "Nested Exception Rules", formalDefinition = "Rules which provide exceptions to the base rule or subrules.")
protected List<provisionComponent> provision;
protected List<ProvisionComponent> provision;
private static final long serialVersionUID = -1280172451L;
/**
* Constructor
*/
public provisionComponent() {
public ProvisionComponent() {
super();
}
@ -1357,7 +1357,7 @@ public class Consent extends DomainResource {
* extensions. The accessor "getType" gives direct access to the
* value
*/
public provisionComponent setTypeElement(Enumeration<ConsentProvisionType> value) {
public ProvisionComponent setTypeElement(Enumeration<ConsentProvisionType> value) {
this.type = value;
return this;
}
@ -1374,7 +1374,7 @@ public class Consent extends DomainResource {
* @param value Action to take - permit or deny - when the rule conditions are
* met. Not permitted in root rule, required in all nested rules.
*/
public provisionComponent setType(ConsentProvisionType value) {
public ProvisionComponent setType(ConsentProvisionType value) {
if (value == null)
this.type = null;
else {
@ -1404,7 +1404,7 @@ public class Consent extends DomainResource {
/**
* @param value {@link #period} (The timeframe in this rule is valid.)
*/
public provisionComponent setPeriod(Period value) {
public ProvisionComponent setPeriod(Period value) {
this.period = value;
return this;
}
@ -1423,7 +1423,7 @@ public class Consent extends DomainResource {
/**
* @return Returns a reference to <code>this</code> for easy method chaining
*/
public provisionComponent setActor(List<provisionActorComponent> theActor) {
public ProvisionComponent setActor(List<provisionActorComponent> theActor) {
this.actor = theActor;
return this;
}
@ -1445,7 +1445,7 @@ public class Consent extends DomainResource {
return t;
}
public provisionComponent addActor(provisionActorComponent t) { // 3
public ProvisionComponent addActor(provisionActorComponent t) { // 3
if (t == null)
return this;
if (this.actor == null)
@ -1477,7 +1477,7 @@ public class Consent extends DomainResource {
/**
* @return Returns a reference to <code>this</code> for easy method chaining
*/
public provisionComponent setAction(List<CodeableConcept> theAction) {
public ProvisionComponent setAction(List<CodeableConcept> theAction) {
this.action = theAction;
return this;
}
@ -1499,7 +1499,7 @@ public class Consent extends DomainResource {
return t;
}
public provisionComponent addAction(CodeableConcept t) { // 3
public ProvisionComponent addAction(CodeableConcept t) { // 3
if (t == null)
return this;
if (this.action == null)
@ -1533,7 +1533,7 @@ public class Consent extends DomainResource {
/**
* @return Returns a reference to <code>this</code> for easy method chaining
*/
public provisionComponent setSecurityLabel(List<Coding> theSecurityLabel) {
public ProvisionComponent setSecurityLabel(List<Coding> theSecurityLabel) {
this.securityLabel = theSecurityLabel;
return this;
}
@ -1555,7 +1555,7 @@ public class Consent extends DomainResource {
return t;
}
public provisionComponent addSecurityLabel(Coding t) { // 3
public ProvisionComponent addSecurityLabel(Coding t) { // 3
if (t == null)
return this;
if (this.securityLabel == null)
@ -1589,7 +1589,7 @@ public class Consent extends DomainResource {
/**
* @return Returns a reference to <code>this</code> for easy method chaining
*/
public provisionComponent setPurpose(List<Coding> thePurpose) {
public ProvisionComponent setPurpose(List<Coding> thePurpose) {
this.purpose = thePurpose;
return this;
}
@ -1611,7 +1611,7 @@ public class Consent extends DomainResource {
return t;
}
public provisionComponent addPurpose(Coding t) { // 3
public ProvisionComponent addPurpose(Coding t) { // 3
if (t == null)
return this;
if (this.purpose == null)
@ -1646,7 +1646,7 @@ public class Consent extends DomainResource {
/**
* @return Returns a reference to <code>this</code> for easy method chaining
*/
public provisionComponent setClass_(List<Coding> theClass_) {
public ProvisionComponent setClass_(List<Coding> theClass_) {
this.class_ = theClass_;
return this;
}
@ -1668,7 +1668,7 @@ public class Consent extends DomainResource {
return t;
}
public provisionComponent addClass_(Coding t) { // 3
public ProvisionComponent addClass_(Coding t) { // 3
if (t == null)
return this;
if (this.class_ == null)
@ -1701,7 +1701,7 @@ public class Consent extends DomainResource {
/**
* @return Returns a reference to <code>this</code> for easy method chaining
*/
public provisionComponent setCode(List<CodeableConcept> theCode) {
public ProvisionComponent setCode(List<CodeableConcept> theCode) {
this.code = theCode;
return this;
}
@ -1723,7 +1723,7 @@ public class Consent extends DomainResource {
return t;
}
public provisionComponent addCode(CodeableConcept t) { // 3
public ProvisionComponent addCode(CodeableConcept t) { // 3
if (t == null)
return this;
if (this.code == null)
@ -1764,7 +1764,7 @@ public class Consent extends DomainResource {
* @param value {@link #dataPeriod} (Clinical or Operational Relevant period of
* time that bounds the data controlled by this rule.)
*/
public provisionComponent setDataPeriod(Period value) {
public ProvisionComponent setDataPeriod(Period value) {
this.dataPeriod = value;
return this;
}
@ -1782,7 +1782,7 @@ public class Consent extends DomainResource {
/**
* @return Returns a reference to <code>this</code> for easy method chaining
*/
public provisionComponent setData(List<provisionDataComponent> theData) {
public ProvisionComponent setData(List<provisionDataComponent> theData) {
this.data = theData;
return this;
}
@ -1804,7 +1804,7 @@ public class Consent extends DomainResource {
return t;
}
public provisionComponent addData(provisionDataComponent t) { // 3
public ProvisionComponent addData(provisionDataComponent t) { // 3
if (t == null)
return this;
if (this.data == null)
@ -1828,16 +1828,16 @@ public class Consent extends DomainResource {
* @return {@link #provision} (Rules which provide exceptions to the base rule
* or subrules.)
*/
public List<provisionComponent> getProvision() {
public List<ProvisionComponent> getProvision() {
if (this.provision == null)
this.provision = new ArrayList<provisionComponent>();
this.provision = new ArrayList<ProvisionComponent>();
return this.provision;
}
/**
* @return Returns a reference to <code>this</code> for easy method chaining
*/
public provisionComponent setProvision(List<provisionComponent> theProvision) {
public ProvisionComponent setProvision(List<ProvisionComponent> theProvision) {
this.provision = theProvision;
return this;
}
@ -1845,25 +1845,25 @@ public class Consent extends DomainResource {
public boolean hasProvision() {
if (this.provision == null)
return false;
for (provisionComponent item : this.provision)
for (ProvisionComponent item : this.provision)
if (!item.isEmpty())
return true;
return false;
}
public provisionComponent addProvision() { // 3
provisionComponent t = new provisionComponent();
public ProvisionComponent addProvision() { // 3
ProvisionComponent t = new ProvisionComponent();
if (this.provision == null)
this.provision = new ArrayList<provisionComponent>();
this.provision = new ArrayList<ProvisionComponent>();
this.provision.add(t);
return t;
}
public provisionComponent addProvision(provisionComponent t) { // 3
public ProvisionComponent addProvision(ProvisionComponent t) { // 3
if (t == null)
return this;
if (this.provision == null)
this.provision = new ArrayList<provisionComponent>();
this.provision = new ArrayList<ProvisionComponent>();
this.provision.add(t);
return this;
}
@ -1872,7 +1872,7 @@ public class Consent extends DomainResource {
* @return The first repetition of repeating field {@link #provision}, creating
* it if it does not already exist
*/
public provisionComponent getProvisionFirstRep() {
public ProvisionComponent getProvisionFirstRep() {
if (getProvision().isEmpty()) {
addProvision();
}
@ -2027,7 +2027,7 @@ public class Consent extends DomainResource {
this.getData().add((provisionDataComponent) value); // provisionDataComponent
return value;
case -547120939: // provision
this.getProvision().add((provisionComponent) value); // provisionComponent
this.getProvision().add((ProvisionComponent) value); // provisionComponent
return value;
default:
return super.setProperty(hash, name, value);
@ -2059,7 +2059,7 @@ public class Consent extends DomainResource {
} else if (name.equals("data")) {
this.getData().add((provisionDataComponent) value);
} else if (name.equals("provision")) {
this.getProvision().add((provisionComponent) value);
this.getProvision().add((ProvisionComponent) value);
} else
return super.setProperty(name, value);
return value;
@ -2088,7 +2088,7 @@ public class Consent extends DomainResource {
} else if (name.equals("data")) {
this.getData().remove((provisionDataComponent) value);
} else if (name.equals("provision")) {
this.getProvision().remove((provisionComponent) value);
this.getProvision().remove((ProvisionComponent) value);
} else
super.removeChild(name, value);
@ -2186,13 +2186,13 @@ public class Consent extends DomainResource {
return super.addChild(name);
}
public provisionComponent copy() {
provisionComponent dst = new provisionComponent();
public ProvisionComponent copy() {
ProvisionComponent dst = new ProvisionComponent();
copyValues(dst);
return dst;
}
public void copyValues(provisionComponent dst) {
public void copyValues(ProvisionComponent dst) {
super.copyValues(dst);
dst.type = type == null ? null : type.copy();
dst.period = period == null ? null : period.copy();
@ -2240,8 +2240,8 @@ public class Consent extends DomainResource {
}
;
if (provision != null) {
dst.provision = new ArrayList<provisionComponent>();
for (provisionComponent i : provision)
dst.provision = new ArrayList<ProvisionComponent>();
for (ProvisionComponent i : provision)
dst.provision.add(i.copy());
}
;
@ -2251,9 +2251,9 @@ public class Consent extends DomainResource {
public boolean equalsDeep(Base other_) {
if (!super.equalsDeep(other_))
return false;
if (!(other_ instanceof provisionComponent))
if (!(other_ instanceof ProvisionComponent))
return false;
provisionComponent o = (provisionComponent) other_;
ProvisionComponent o = (ProvisionComponent) other_;
return compareDeep(type, o.type, true) && compareDeep(period, o.period, true) && compareDeep(actor, o.actor, true)
&& compareDeep(action, o.action, true) && compareDeep(securityLabel, o.securityLabel, true)
&& compareDeep(purpose, o.purpose, true) && compareDeep(class_, o.class_, true)
@ -2265,9 +2265,9 @@ public class Consent extends DomainResource {
public boolean equalsShallow(Base other_) {
if (!super.equalsShallow(other_))
return false;
if (!(other_ instanceof provisionComponent))
if (!(other_ instanceof ProvisionComponent))
return false;
provisionComponent o = (provisionComponent) other_;
ProvisionComponent o = (ProvisionComponent) other_;
return compareValues(type, o.type, true);
}
@ -3002,7 +3002,7 @@ public class Consent extends DomainResource {
*/
@Child(name = "provision", type = {}, order = 12, min = 0, max = 1, modifier = false, summary = true)
@Description(shortDefinition = "Constraints to the base Consent.policyRule", formalDefinition = "An exception to the base policy of this consent. An exception can be an addition or removal of access permissions.")
protected provisionComponent provision;
protected ProvisionComponent provision;
private static final long serialVersionUID = 206528051L;
@ -3669,12 +3669,12 @@ public class Consent extends DomainResource {
* @return {@link #provision} (An exception to the base policy of this consent.
* An exception can be an addition or removal of access permissions.)
*/
public provisionComponent getProvision() {
public ProvisionComponent getProvision() {
if (this.provision == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create Consent.provision");
else if (Configuration.doAutoCreate())
this.provision = new provisionComponent(); // cc
this.provision = new ProvisionComponent(); // cc
return this.provision;
}
@ -3687,7 +3687,7 @@ public class Consent extends DomainResource {
* consent. An exception can be an addition or removal of access
* permissions.)
*/
public Consent setProvision(provisionComponent value) {
public Consent setProvision(ProvisionComponent value) {
this.provision = value;
return this;
}
@ -3883,7 +3883,7 @@ public class Consent extends DomainResource {
this.getVerification().add((ConsentVerificationComponent) value); // ConsentVerificationComponent
return value;
case -547120939: // provision
this.provision = (provisionComponent) value; // provisionComponent
this.provision = (ProvisionComponent) value; // provisionComponent
return value;
default:
return super.setProperty(hash, name, value);
@ -3919,7 +3919,7 @@ public class Consent extends DomainResource {
} else if (name.equals("verification")) {
this.getVerification().add((ConsentVerificationComponent) value);
} else if (name.equals("provision")) {
this.provision = (provisionComponent) value; // provisionComponent
this.provision = (ProvisionComponent) value; // provisionComponent
} else
return super.setProperty(name, value);
return value;
@ -3952,7 +3952,7 @@ public class Consent extends DomainResource {
} else if (name.equals("verification")) {
this.getVerification().remove((ConsentVerificationComponent) value);
} else if (name.equals("provision")) {
this.provision = (provisionComponent) value; // provisionComponent
this.provision = (ProvisionComponent) value; // provisionComponent
} else
super.removeChild(name, value);
@ -4064,7 +4064,7 @@ public class Consent extends DomainResource {
} else if (name.equals("verification")) {
return addVerification();
} else if (name.equals("provision")) {
this.provision = new provisionComponent();
this.provision = new ProvisionComponent();
return this.provision;
} else
return super.addChild(name);