From 969174136e9102b0b88ad0536f2f45e5a5d3a562 Mon Sep 17 00:00:00 2001 From: John Poth Date: Thu, 24 Oct 2019 18:30:06 +0200 Subject: [PATCH] Rename org.hl7.fhir.convertors package as it's already used --- examples/src/main/java/example/ConverterExamples.java | 1 + hapi-fhir-converter/pom.xml | 8 +------- .../server/VersionedApiConverterInterceptor.java | 2 ++ .../NullVersionConverterAdvisor30.java | 3 ++- .../NullVersionConverterAdvisor40.java | 3 ++- .../NullVersionConverterAdvisor50.java | 3 ++- .../VersionConvertor_10_30Test.java | 3 ++- .../VersionConvertor_14_30Test.java | 3 ++- .../java/ca/uhn/hapi/fhir/docs/ConverterExamples.java | 2 +- .../instance/hapi/validation/FhirInstanceValidator.java | 2 +- 10 files changed, 16 insertions(+), 14 deletions(-) rename hapi-fhir-converter/src/main/java/org/hl7/fhir/{convertors => converter}/NullVersionConverterAdvisor30.java (93%) rename hapi-fhir-converter/src/main/java/org/hl7/fhir/{convertors => converter}/NullVersionConverterAdvisor40.java (94%) rename hapi-fhir-converter/src/main/java/org/hl7/fhir/{convertors => converter}/NullVersionConverterAdvisor50.java (95%) rename hapi-fhir-converter/src/test/java/org/hl7/fhir/{convertors => converter}/VersionConvertor_10_30Test.java (96%) rename hapi-fhir-converter/src/test/java/org/hl7/fhir/{convertors => converter}/VersionConvertor_14_30Test.java (86%) diff --git a/examples/src/main/java/example/ConverterExamples.java b/examples/src/main/java/example/ConverterExamples.java index f6a2759b14c..219b59f7a22 100644 --- a/examples/src/main/java/example/ConverterExamples.java +++ b/examples/src/main/java/example/ConverterExamples.java @@ -1,5 +1,6 @@ package example; +import org.hl7.fhir.converter.NullVersionConverterAdvisor30; import org.hl7.fhir.convertors.*; import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-converter/pom.xml b/hapi-fhir-converter/pom.xml index aa26e503a5f..8be5b7c1d77 100644 --- a/hapi-fhir-converter/pom.xml +++ b/hapi-fhir-converter/pom.xml @@ -10,8 +10,7 @@ hapi-fhir-converter - - jar + bundle @@ -152,10 +151,6 @@ - diff --git a/hapi-fhir-converter/src/main/java/ca/uhn/hapi/converters/server/VersionedApiConverterInterceptor.java b/hapi-fhir-converter/src/main/java/ca/uhn/hapi/converters/server/VersionedApiConverterInterceptor.java index 1e43400f641..ebdae1f3e1d 100644 --- a/hapi-fhir-converter/src/main/java/ca/uhn/hapi/converters/server/VersionedApiConverterInterceptor.java +++ b/hapi-fhir-converter/src/main/java/ca/uhn/hapi/converters/server/VersionedApiConverterInterceptor.java @@ -29,6 +29,8 @@ import ca.uhn.fhir.rest.api.server.ResponseDetails; import ca.uhn.fhir.rest.server.exceptions.AuthenticationException; import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; import ca.uhn.fhir.rest.server.interceptor.InterceptorAdapter; +import org.hl7.fhir.converter.NullVersionConverterAdvisor30; +import org.hl7.fhir.converter.NullVersionConverterAdvisor40; import org.hl7.fhir.convertors.*; import org.hl7.fhir.dstu3.model.Resource; import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/NullVersionConverterAdvisor30.java b/hapi-fhir-converter/src/main/java/org/hl7/fhir/converter/NullVersionConverterAdvisor30.java similarity index 93% rename from hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/NullVersionConverterAdvisor30.java rename to hapi-fhir-converter/src/main/java/org/hl7/fhir/converter/NullVersionConverterAdvisor30.java index 66d607affe3..4ef98100c83 100644 --- a/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/NullVersionConverterAdvisor30.java +++ b/hapi-fhir-converter/src/main/java/org/hl7/fhir/converter/NullVersionConverterAdvisor30.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.convertors; +package org.hl7.fhir.converter; /* * #%L @@ -20,6 +20,7 @@ package org.hl7.fhir.convertors; * #L% */ +import org.hl7.fhir.convertors.VersionConvertorAdvisor30; import org.hl7.fhir.dstu3.model.Bundle.BundleEntryComponent; import org.hl7.fhir.dstu3.model.CodeSystem; import org.hl7.fhir.dstu3.model.ValueSet; diff --git a/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/NullVersionConverterAdvisor40.java b/hapi-fhir-converter/src/main/java/org/hl7/fhir/converter/NullVersionConverterAdvisor40.java similarity index 94% rename from hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/NullVersionConverterAdvisor40.java rename to hapi-fhir-converter/src/main/java/org/hl7/fhir/converter/NullVersionConverterAdvisor40.java index 82a4287e804..0d8daecb3ff 100644 --- a/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/NullVersionConverterAdvisor40.java +++ b/hapi-fhir-converter/src/main/java/org/hl7/fhir/converter/NullVersionConverterAdvisor40.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.convertors; +package org.hl7.fhir.converter; /* * #%L @@ -20,6 +20,7 @@ package org.hl7.fhir.convertors; * #L% */ +import org.hl7.fhir.convertors.VersionConvertorAdvisor40; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.dstu2.model.Resource; import org.hl7.fhir.r4.model.Bundle.BundleEntryComponent; diff --git a/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/NullVersionConverterAdvisor50.java b/hapi-fhir-converter/src/main/java/org/hl7/fhir/converter/NullVersionConverterAdvisor50.java similarity index 95% rename from hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/NullVersionConverterAdvisor50.java rename to hapi-fhir-converter/src/main/java/org/hl7/fhir/converter/NullVersionConverterAdvisor50.java index e1f0cdb413c..41b233f550f 100644 --- a/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/NullVersionConverterAdvisor50.java +++ b/hapi-fhir-converter/src/main/java/org/hl7/fhir/converter/NullVersionConverterAdvisor50.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.convertors; +package org.hl7.fhir.converter; /* * #%L @@ -20,6 +20,7 @@ package org.hl7.fhir.convertors; * #L% */ +import org.hl7.fhir.convertors.VersionConvertorAdvisor50; import org.hl7.fhir.dstu2.model.Resource; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.Bundle; diff --git a/hapi-fhir-converter/src/test/java/org/hl7/fhir/convertors/VersionConvertor_10_30Test.java b/hapi-fhir-converter/src/test/java/org/hl7/fhir/converter/VersionConvertor_10_30Test.java similarity index 96% rename from hapi-fhir-converter/src/test/java/org/hl7/fhir/convertors/VersionConvertor_10_30Test.java rename to hapi-fhir-converter/src/test/java/org/hl7/fhir/converter/VersionConvertor_10_30Test.java index 14d27d332f7..be77cdb8515 100644 --- a/hapi-fhir-converter/src/test/java/org/hl7/fhir/convertors/VersionConvertor_10_30Test.java +++ b/hapi-fhir-converter/src/test/java/org/hl7/fhir/converter/VersionConvertor_10_30Test.java @@ -1,7 +1,8 @@ -package org.hl7.fhir.convertors; +package org.hl7.fhir.converter; import static org.junit.Assert.assertEquals; +import org.hl7.fhir.convertors.VersionConvertor_10_30; import org.hl7.fhir.dstu3.model.*; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.dstu2.model.Resource; diff --git a/hapi-fhir-converter/src/test/java/org/hl7/fhir/convertors/VersionConvertor_14_30Test.java b/hapi-fhir-converter/src/test/java/org/hl7/fhir/converter/VersionConvertor_14_30Test.java similarity index 86% rename from hapi-fhir-converter/src/test/java/org/hl7/fhir/convertors/VersionConvertor_14_30Test.java rename to hapi-fhir-converter/src/test/java/org/hl7/fhir/converter/VersionConvertor_14_30Test.java index 66b130eb76c..14fa9db116a 100644 --- a/hapi-fhir-converter/src/test/java/org/hl7/fhir/convertors/VersionConvertor_14_30Test.java +++ b/hapi-fhir-converter/src/test/java/org/hl7/fhir/converter/VersionConvertor_14_30Test.java @@ -1,7 +1,8 @@ -package org.hl7.fhir.convertors; +package org.hl7.fhir.converter; import static org.junit.Assert.assertEquals; +import org.hl7.fhir.convertors.VersionConvertor_14_30; import org.hl7.fhir.exceptions.FHIRException; import org.junit.Test; diff --git a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ConverterExamples.java b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ConverterExamples.java index c37f99db92f..82fa6a745b9 100644 --- a/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ConverterExamples.java +++ b/hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ConverterExamples.java @@ -20,7 +20,7 @@ package ca.uhn.hapi.fhir.docs; * #L% */ -import org.hl7.fhir.convertors.NullVersionConverterAdvisor30; +import org.hl7.fhir.converter.NullVersionConverterAdvisor30; import org.hl7.fhir.convertors.VersionConvertor_10_30; import org.hl7.fhir.convertors.VersionConvertor_14_30; import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-validation/src/main/java/org/hl7/fhir/instance/hapi/validation/FhirInstanceValidator.java b/hapi-fhir-validation/src/main/java/org/hl7/fhir/instance/hapi/validation/FhirInstanceValidator.java index 002d8dfbd25..54721ce72ed 100644 --- a/hapi-fhir-validation/src/main/java/org/hl7/fhir/instance/hapi/validation/FhirInstanceValidator.java +++ b/hapi-fhir-validation/src/main/java/org/hl7/fhir/instance/hapi/validation/FhirInstanceValidator.java @@ -15,7 +15,7 @@ import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.fhir.ucum.UcumService; -import org.hl7.fhir.convertors.NullVersionConverterAdvisor50; +import org.hl7.fhir.converter.NullVersionConverterAdvisor50; import org.hl7.fhir.convertors.VersionConvertorAdvisor50; import org.hl7.fhir.convertors.VersionConvertor_10_50; import org.hl7.fhir.dstu2.model.*;