From a0c8593ad0cf8aae652a5b8499389646adce2a6d Mon Sep 17 00:00:00 2001 From: William Denton Date: Thu, 20 Jul 2023 11:54:43 -0700 Subject: [PATCH] fix split-package conflicts with org.hl7.fhir.*.model packages in FHIR (#5109) Core projects --- .../java/org/hl7/fhir/dstu2016may/hapi/ctx/FhirDstu2_1.java | 6 +++--- .../dstu2016may/{ => hapi}/model/fhirversion.properties | 0 .../main/java/org/hl7/fhir/dstu3/hapi/ctx/FhirDstu3.java | 6 +++--- .../hl7/fhir/dstu3/{ => hapi}/model/fhirversion.properties | 0 .../src/main/java/org/hl7/fhir/r4/hapi/ctx/FhirR4.java | 2 +- .../org/hl7/fhir/r4/{ => hapi}/model/fhirversion.properties | 0 .../src/main/java/org/hl7/fhir/r4b/hapi/ctx/FhirR4B.java | 2 +- .../hl7/fhir/r4b/{ => hapi}/model/fhirversion.properties | 0 .../src/main/java/org/hl7/fhir/r5/hapi/ctx/FhirR5.java | 2 +- .../org/hl7/fhir/r5/{ => hapi}/model/fhirversion.properties | 0 10 files changed, 9 insertions(+), 9 deletions(-) rename hapi-fhir-structures-dstu2.1/src/main/resources/org/hl7/fhir/dstu2016may/{ => hapi}/model/fhirversion.properties (100%) rename hapi-fhir-structures-dstu3/src/main/resources/org/hl7/fhir/dstu3/{ => hapi}/model/fhirversion.properties (100%) rename hapi-fhir-structures-r4/src/main/resources/org/hl7/fhir/r4/{ => hapi}/model/fhirversion.properties (100%) rename hapi-fhir-structures-r4b/src/main/resources/org/hl7/fhir/r4b/{ => hapi}/model/fhirversion.properties (100%) rename hapi-fhir-structures-r5/src/main/resources/org/hl7/fhir/r5/{ => hapi}/model/fhirversion.properties (100%) diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu2016may/hapi/ctx/FhirDstu2_1.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu2016may/hapi/ctx/FhirDstu2_1.java index cf90e7a2201..4c6fc628efc 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu2016may/hapi/ctx/FhirDstu2_1.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu2016may/hapi/ctx/FhirDstu2_1.java @@ -68,13 +68,13 @@ public class FhirDstu2_1 implements IFhirVersion { @Override public InputStream getFhirVersionPropertiesFile() { InputStream str = - FhirDstu2_1.class.getResourceAsStream("/org/hl7/fhir/dstu2016may/model/fhirversion.properties"); + FhirDstu2_1.class.getResourceAsStream("/org/hl7/fhir/dstu2016may/hapi/model/fhirversion.properties"); if (str == null) { - str = FhirDstu2_1.class.getResourceAsStream("/org/hl7/fhir/dstu2016may/model/fhirversion.properties"); + str = FhirDstu2_1.class.getResourceAsStream("/org/hl7/fhir/dstu2016may/hapi/model/fhirversion.properties"); } if (str == null) { throw new ConfigurationException(Msg.code(467) + "Can not find model property file on classpath: " - + "/ca/uhn/fhir/model/dstu2016may/fhirversion.properties"); + + "/org/hl7/fhir/dstu2016may/hapi/model/fhirversion.properties"); } return str; } diff --git a/hapi-fhir-structures-dstu2.1/src/main/resources/org/hl7/fhir/dstu2016may/model/fhirversion.properties b/hapi-fhir-structures-dstu2.1/src/main/resources/org/hl7/fhir/dstu2016may/hapi/model/fhirversion.properties similarity index 100% rename from hapi-fhir-structures-dstu2.1/src/main/resources/org/hl7/fhir/dstu2016may/model/fhirversion.properties rename to hapi-fhir-structures-dstu2.1/src/main/resources/org/hl7/fhir/dstu2016may/hapi/model/fhirversion.properties diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/ctx/FhirDstu3.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/ctx/FhirDstu3.java index 54340f6b8b7..5b279604e34 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/ctx/FhirDstu3.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/ctx/FhirDstu3.java @@ -71,13 +71,13 @@ public class FhirDstu3 implements IFhirVersion { @Override public InputStream getFhirVersionPropertiesFile() { - InputStream str = FhirDstu3.class.getResourceAsStream("/org/hl7/fhir/dstu3/model/fhirversion.properties"); + InputStream str = FhirDstu3.class.getResourceAsStream("/org/hl7/fhir/dstu3/hapi/model/fhirversion.properties"); if (str == null) { - str = FhirDstu3.class.getResourceAsStream("/org/hl7/fhir/dstu3/model/fhirversion.properties"); + str = FhirDstu3.class.getResourceAsStream("/org/hl7/fhir/dstu3/hapi/model/fhirversion.properties"); } if (str == null) { throw new ConfigurationException(Msg.code(609) + "Can not find model property file on classpath: " - + "/ca/uhn/fhir/model/dstu3/fhirversion.properties"); + + "/org/hl7/fhir/dstu3/hapi/model/fhirversion.properties"); } return str; } diff --git a/hapi-fhir-structures-dstu3/src/main/resources/org/hl7/fhir/dstu3/model/fhirversion.properties b/hapi-fhir-structures-dstu3/src/main/resources/org/hl7/fhir/dstu3/hapi/model/fhirversion.properties similarity index 100% rename from hapi-fhir-structures-dstu3/src/main/resources/org/hl7/fhir/dstu3/model/fhirversion.properties rename to hapi-fhir-structures-dstu3/src/main/resources/org/hl7/fhir/dstu3/hapi/model/fhirversion.properties diff --git a/hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/hapi/ctx/FhirR4.java b/hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/hapi/ctx/FhirR4.java index a7efad6dcfa..18fd17435ce 100644 --- a/hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/hapi/ctx/FhirR4.java +++ b/hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/hapi/ctx/FhirR4.java @@ -68,7 +68,7 @@ public class FhirR4 implements IFhirVersion { @Override public InputStream getFhirVersionPropertiesFile() { - String path = "org/hl7/fhir/r4/model/fhirversion.properties"; + String path = "org/hl7/fhir/r4/hapi/model/fhirversion.properties"; InputStream str = FhirR4.class.getResourceAsStream("/" + path); if (str == null) { str = FhirR4.class.getResourceAsStream(path); diff --git a/hapi-fhir-structures-r4/src/main/resources/org/hl7/fhir/r4/model/fhirversion.properties b/hapi-fhir-structures-r4/src/main/resources/org/hl7/fhir/r4/hapi/model/fhirversion.properties similarity index 100% rename from hapi-fhir-structures-r4/src/main/resources/org/hl7/fhir/r4/model/fhirversion.properties rename to hapi-fhir-structures-r4/src/main/resources/org/hl7/fhir/r4/hapi/model/fhirversion.properties diff --git a/hapi-fhir-structures-r4b/src/main/java/org/hl7/fhir/r4b/hapi/ctx/FhirR4B.java b/hapi-fhir-structures-r4b/src/main/java/org/hl7/fhir/r4b/hapi/ctx/FhirR4B.java index ac9131d4ba3..a00e7960d08 100644 --- a/hapi-fhir-structures-r4b/src/main/java/org/hl7/fhir/r4b/hapi/ctx/FhirR4B.java +++ b/hapi-fhir-structures-r4b/src/main/java/org/hl7/fhir/r4b/hapi/ctx/FhirR4B.java @@ -79,7 +79,7 @@ public class FhirR4B implements IFhirVersion { @Override public InputStream getFhirVersionPropertiesFile() { - String path = "org/hl7/fhir/r4b/model/fhirversion.properties"; + String path = "org/hl7/fhir/r4b/hapi/model/fhirversion.properties"; InputStream str = FhirR4B.class.getResourceAsStream("/" + path); if (str == null) { str = FhirR4B.class.getResourceAsStream(path); diff --git a/hapi-fhir-structures-r4b/src/main/resources/org/hl7/fhir/r4b/model/fhirversion.properties b/hapi-fhir-structures-r4b/src/main/resources/org/hl7/fhir/r4b/hapi/model/fhirversion.properties similarity index 100% rename from hapi-fhir-structures-r4b/src/main/resources/org/hl7/fhir/r4b/model/fhirversion.properties rename to hapi-fhir-structures-r4b/src/main/resources/org/hl7/fhir/r4b/hapi/model/fhirversion.properties diff --git a/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/ctx/FhirR5.java b/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/ctx/FhirR5.java index 5e4402f9441..daae71ca10d 100644 --- a/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/ctx/FhirR5.java +++ b/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/ctx/FhirR5.java @@ -79,7 +79,7 @@ public class FhirR5 implements IFhirVersion { @Override public InputStream getFhirVersionPropertiesFile() { - String path = "org/hl7/fhir/r5/model/fhirversion.properties"; + String path = "org/hl7/fhir/r5/hapi/model/fhirversion.properties"; InputStream str = FhirR5.class.getResourceAsStream("/" + path); if (str == null) { str = FhirR5.class.getResourceAsStream(path); diff --git a/hapi-fhir-structures-r5/src/main/resources/org/hl7/fhir/r5/model/fhirversion.properties b/hapi-fhir-structures-r5/src/main/resources/org/hl7/fhir/r5/hapi/model/fhirversion.properties similarity index 100% rename from hapi-fhir-structures-r5/src/main/resources/org/hl7/fhir/r5/model/fhirversion.properties rename to hapi-fhir-structures-r5/src/main/resources/org/hl7/fhir/r5/hapi/model/fhirversion.properties