Skip to content

Commit 0c7e6ce

Browse files
grahamegrievegrahamegrieve
authored
Merge pull request hapifhir#1649 from hapifhir/do-20240606-fix-classname-typo
Fix case typo in Consent.ProvisionComponent
2 parents bfed8a1 + f7a4956 commit 0c7e6ce

File tree

5 files changed

+71
-69
lines changed

5 files changed

+71
-69
lines changed

‎org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_40/resources30_40/Consent30_40.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import org.hl7.fhir.convertors.conv30_40.datatypes30_40.primitivetypes30_40.Uri30_40;
1414
import org.hl7.fhir.exceptions.FHIRException;
1515
import org.hl7.fhir.r4.model.CodeableConcept;
16+
import org.hl7.fhir.r4.model.Consent;
1617
import org.hl7.fhir.r4.model.Identifier;
1718

1819
public class Consent30_40 {
@@ -47,7 +48,7 @@ static public org.hl7.fhir.r4.model.Consent convertConsent(org.hl7.fhir.dstu3.mo
4748
tgt.setPolicyRule(new CodeableConcept(c));
4849
}
4950
if (src.hasSecurityLabel() || src.hasPeriod() || src.hasActor() || src.hasAction() || src.hasPurpose() || src.hasDataPeriod() || src.hasData() || src.hasExcept()) {
50-
org.hl7.fhir.r4.model.Consent.provisionComponent pc = new org.hl7.fhir.r4.model.Consent.provisionComponent();
51+
Consent.ProvisionComponent pc = new Consent.ProvisionComponent();
5152
if (src.hasPeriod())
5253
pc.setPeriod(Period30_40.convertPeriod(src.getPeriod()));
5354
for (org.hl7.fhir.dstu3.model.Consent.ConsentActorComponent t : src.getActor())
@@ -104,7 +105,7 @@ static public org.hl7.fhir.dstu3.model.Consent convertConsent(org.hl7.fhir.r4.mo
104105
}
105106
}
106107
if (src.hasProvision()) {
107-
org.hl7.fhir.r4.model.Consent.provisionComponent p = src.getProvision();
108+
Consent.ProvisionComponent p = src.getProvision();
108109
if (p.hasPeriod())
109110
tgt.setPeriod(Period30_40.convertPeriod(p.getPeriod()));
110111
for (org.hl7.fhir.r4.model.Consent.provisionActorComponent t : p.getActor())
@@ -117,7 +118,7 @@ static public org.hl7.fhir.dstu3.model.Consent convertConsent(org.hl7.fhir.r4.mo
117118
tgt.setDataPeriod(Period30_40.convertPeriod(p.getDataPeriod()));
118119
for (org.hl7.fhir.r4.model.Consent.provisionDataComponent t : p.getData())
119120
tgt.addData(convertConsentDataComponent(t));
120-
for (org.hl7.fhir.r4.model.Consent.provisionComponent t : p.getProvision())
121+
for (Consent.ProvisionComponent t : p.getProvision())
121122
tgt.addExcept(convertExceptComponent(t));
122123
}
123124
return tgt;
@@ -369,7 +370,7 @@ static public org.hl7.fhir.r4.model.Consent.provisionActorComponent convertExcep
369370
return tgt;
370371
}
371372

372-
static public org.hl7.fhir.dstu3.model.Consent.ExceptComponent convertExceptComponent(org.hl7.fhir.r4.model.Consent.provisionComponent src) throws FHIRException {
373+
static public org.hl7.fhir.dstu3.model.Consent.ExceptComponent convertExceptComponent(Consent.ProvisionComponent src) throws FHIRException {
373374
if (src == null)
374375
return null;
375376
org.hl7.fhir.dstu3.model.Consent.ExceptComponent tgt = new org.hl7.fhir.dstu3.model.Consent.ExceptComponent();
@@ -393,10 +394,10 @@ static public org.hl7.fhir.dstu3.model.Consent.ExceptComponent convertExceptComp
393394
return tgt;
394395
}
395396

396-
static public org.hl7.fhir.r4.model.Consent.provisionComponent convertExceptComponent(org.hl7.fhir.dstu3.model.Consent.ExceptComponent src) throws FHIRException {
397+
static public Consent.ProvisionComponent convertExceptComponent(org.hl7.fhir.dstu3.model.Consent.ExceptComponent src) throws FHIRException {
397398
if (src == null)
398399
return null;
399-
org.hl7.fhir.r4.model.Consent.provisionComponent tgt = new org.hl7.fhir.r4.model.Consent.provisionComponent();
400+
Consent.ProvisionComponent tgt = new Consent.ProvisionComponent();
400401
ConversionContext30_40.INSTANCE.getVersionConvertor_30_40().copyBackboneElement(src,tgt);
401402
if (src.hasType())
402403
tgt.setTypeElement(convertConsentExceptType(src.getTypeElement()));

‎org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/resources40_50/Consent40_50.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.hl7.fhir.convertors.conv40_50.datatypes40_50.primitive40_50.DateTime40_50;
1111
import org.hl7.fhir.convertors.conv40_50.datatypes40_50.special40_50.Reference40_50;
1212
import org.hl7.fhir.exceptions.FHIRException;
13+
import org.hl7.fhir.r4.model.Consent;
1314

1415
/*
1516
Copyright (c) 2011+, HL7, Inc.
@@ -220,7 +221,7 @@ public static org.hl7.fhir.r4.model.Consent.ConsentVerificationComponent convert
220221
return tgt;
221222
}
222223

223-
public static org.hl7.fhir.r5.model.Consent.ProvisionComponent convertprovisionComponent(org.hl7.fhir.r4.model.Consent.provisionComponent src) throws FHIRException {
224+
public static org.hl7.fhir.r5.model.Consent.ProvisionComponent convertprovisionComponent(Consent.ProvisionComponent src) throws FHIRException {
224225
if (src == null)
225226
return null;
226227
org.hl7.fhir.r5.model.Consent.ProvisionComponent tgt = new org.hl7.fhir.r5.model.Consent.ProvisionComponent();
@@ -242,15 +243,15 @@ public static org.hl7.fhir.r5.model.Consent.ProvisionComponent convertprovisionC
242243
tgt.setDataPeriod(Period40_50.convertPeriod(src.getDataPeriod()));
243244
for (org.hl7.fhir.r4.model.Consent.provisionDataComponent t : src.getData())
244245
tgt.addData(convertprovisionDataComponent(t));
245-
for (org.hl7.fhir.r4.model.Consent.provisionComponent t : src.getProvision())
246+
for (Consent.ProvisionComponent t : src.getProvision())
246247
tgt.addProvision(convertprovisionComponent(t));
247248
return tgt;
248249
}
249250

250-
public static org.hl7.fhir.r4.model.Consent.provisionComponent convertprovisionComponent(org.hl7.fhir.r5.model.Consent.ProvisionComponent src) throws FHIRException {
251+
public static Consent.ProvisionComponent convertprovisionComponent(org.hl7.fhir.r5.model.Consent.ProvisionComponent src) throws FHIRException {
251252
if (src == null)
252253
return null;
253-
org.hl7.fhir.r4.model.Consent.provisionComponent tgt = new org.hl7.fhir.r4.model.Consent.provisionComponent();
254+
Consent.ProvisionComponent tgt = new Consent.ProvisionComponent();
254255
ConversionContext40_50.INSTANCE.getVersionConvertor_40_50().copyBackboneElement(src, tgt);
255256
// if (src.hasType())
256257
// tgt.setTypeElement(convertConsentProvisionType(src.getTypeElement()));

‎org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/formats/RdfParser.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4917,7 +4917,7 @@ protected void composeConsentConsentVerificationComponent(Complex parent, String
49174917
}
49184918

49194919
protected void composeConsentprovisionComponent(Complex parent, String parentType, String name,
4920-
Consent.provisionComponent element, int index) {
4920+
Consent.ProvisionComponent element, int index) {
49214921
if (element == null)
49224922
return;
49234923
Complex t;

‎org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/formats/XmlParser.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -6924,9 +6924,9 @@ protected boolean parseConsentConsentVerificationComponentContent(int eventType,
69246924
return true;
69256925
}
69266926

6927-
protected Consent.provisionComponent parseConsentprovisionComponent(XmlPullParser xpp, Consent owner)
6927+
protected Consent.ProvisionComponent parseConsentprovisionComponent(XmlPullParser xpp, Consent owner)
69286928
throws XmlPullParserException, IOException, FHIRFormatError {
6929-
Consent.provisionComponent res = new Consent.provisionComponent();
6929+
Consent.ProvisionComponent res = new Consent.ProvisionComponent();
69306930
parseBackboneAttributes(xpp, res);
69316931
next(xpp);
69326932
int eventType = nextNoWhitespace(xpp);
@@ -6941,7 +6941,7 @@ protected Consent.provisionComponent parseConsentprovisionComponent(XmlPullParse
69416941
}
69426942

69436943
protected boolean parseConsentprovisionComponentContent(int eventType, XmlPullParser xpp, Consent owner,
6944-
Consent.provisionComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
6944+
Consent.ProvisionComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
69456945
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
69466946
res.setTypeElement(
69476947
parseEnumeration(xpp, Consent.ConsentProvisionType.NULL, new Consent.ConsentProvisionTypeEnumFactory()));
@@ -34008,7 +34008,7 @@ protected void composeConsentConsentVerificationComponentElements(Consent.Consen
3400834008
}
3400934009
}
3401034010

34011-
protected void composeConsentprovisionComponent(String name, Consent.provisionComponent element) throws IOException {
34011+
protected void composeConsentprovisionComponent(String name, Consent.ProvisionComponent element) throws IOException {
3401234012
if (element != null) {
3401334013
composeElementAttributes(element);
3401434014
xml.enter(FHIR_NS, name);
@@ -34018,7 +34018,7 @@ protected void composeConsentprovisionComponent(String name, Consent.provisionCo
3401834018
}
3401934019
}
3402034020

34021-
protected void composeConsentprovisionComponentElements(Consent.provisionComponent element) throws IOException {
34021+
protected void composeConsentprovisionComponentElements(Consent.ProvisionComponent element) throws IOException {
3402234022
composeBackboneElementElements(element);
3402334023
if (element.hasTypeElement())
3402434024
composeEnumeration("type", element.getTypeElement(), new Consent.ConsentProvisionTypeEnumFactory());
@@ -34057,7 +34057,7 @@ protected void composeConsentprovisionComponentElements(Consent.provisionCompone
3405734057
composeConsentprovisionDataComponent("data", e);
3405834058
}
3405934059
if (element.hasProvision()) {
34060-
for (Consent.provisionComponent e : element.getProvision())
34060+
for (Consent.ProvisionComponent e : element.getProvision())
3406134061
composeConsentprovisionComponent("provision", e);
3406234062
}
3406334063
}

0 commit comments

Comments
 (0)