From 0ebf628becc39dfeba744a25e82e68b6508e5674 Mon Sep 17 00:00:00 2001 From: dotasek Date: Tue, 29 Oct 2024 10:21:53 -0400 Subject: [PATCH] Fix expected generated code (#1793) * Fix expected generated code * Update PECodeGenerator.java --------- Co-authored-by: Jens Kristian Villadsen --- .../java/org/hl7/fhir/r5/profilemodel/gen/PECodeGenerator.java | 2 +- .../java/org/hl7/fhir/r5/profiles/TestComplexExtension.java | 2 +- .../test/java/org/hl7/fhir/r5/profiles/TestDatatypeProfile.java | 2 +- .../src/test/java/org/hl7/fhir/r5/profiles/TestProfile.java | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/profilemodel/gen/PECodeGenerator.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/profilemodel/gen/PECodeGenerator.java index 76629a3314..d477f39f11 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/profilemodel/gen/PECodeGenerator.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/profilemodel/gen/PECodeGenerator.java @@ -139,7 +139,7 @@ public void write(StringBuilder b, String copyright) { w(b, "public class "+name+" extends PEGeneratedBase {"); w(b); if (url != null) { - w(b, " private static final String CANONICAL_URL = \""+url+"\";"); + w(b, " public static final String CANONICAL_URL = \""+url+"\";"); w(b); } if (enums.length() > 0) { diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/profiles/TestComplexExtension.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/profiles/TestComplexExtension.java index 0786a662b3..51dbfe809f 100644 --- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/profiles/TestComplexExtension.java +++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/profiles/TestComplexExtension.java @@ -30,7 +30,7 @@ */ public class TestComplexExtension extends PEGeneratedBase { - private static final String CANONICAL_URL = "http://hl7.org/fhir/test/StructureDefinition/pe-extension-complex|0.1"; + public static final String CANONICAL_URL = "http://hl7.org/fhir/test/StructureDefinition/pe-extension-complex|0.1"; @Min("1") @Max("*") @Doco("Additional content defined by implementations") @Definition("May be used to represent additional information that is not part of the basic definition of the element. To make the use of extensions safe and managable, 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.") diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/profiles/TestDatatypeProfile.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/profiles/TestDatatypeProfile.java index 630c49383b..f15b49bb61 100644 --- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/profiles/TestDatatypeProfile.java +++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/profiles/TestDatatypeProfile.java @@ -30,7 +30,7 @@ */ public class TestDatatypeProfile extends PEGeneratedBase { - private static final String CANONICAL_URL = "http://hl7.org/fhir/test/StructureDefinition/pe-profile2|0.1"; + public static final String CANONICAL_URL = "http://hl7.org/fhir/test/StructureDefinition/pe-profile2|0.1"; @Min("1") @Max("2") @Doco("Code defined by a terminology system") @Definition("A reference to a code defined by a terminology system.") diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/profiles/TestProfile.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/profiles/TestProfile.java index 9e7edde7a8..b8c63e9964 100644 --- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/profiles/TestProfile.java +++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/profiles/TestProfile.java @@ -48,7 +48,7 @@ */ public class TestProfile extends PEGeneratedBase { - private static final String CANONICAL_URL = "http://hl7.org/fhir/test/StructureDefinition/pe-profile1|0.1"; + public static final String CANONICAL_URL = "http://hl7.org/fhir/test/StructureDefinition/pe-profile1|0.1"; public enum ProfileObservationCategoryCode { LABORATORY, // "Laboratory" = http://terminology.hl7.org/CodeSystem/observation-category#laboratory diff --git a/pom.xml b/pom.xml index 19df7f687e..f6bd4d8509 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 2.17.0 32.0.1-jre 6.4.1 - 1.6.0 + 1.6.1-SNAPSHOT 2.17.0 5.9.2 1.8.2