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

Rename org.hl7.fhir.convertors package as it's already used

This commit is contained in:
John Poth 2019-10-24 18:30:06 +02:00 committed by James Agnew
parent 74c03b5bb7
commit 969174136e
10 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/src/main/java/example/ConverterExamples.java
View File

@ -1,5 +1,6 @@
package example; package example;
import org.hl7.fhir.converter.NullVersionConverterAdvisor30;
import org.hl7.fhir.convertors.*; import org.hl7.fhir.convertors.*;
import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.exceptions.FHIRException;

8
hapi-fhir-converter/pom.xml
View File

@ -10,8 +10,7 @@
</parent> </parent>
<artifactId>hapi-fhir-converter</artifactId> <artifactId>hapi-fhir-converter</artifactId>
<!-- TODO: BND changed to jar temporarily --> <packaging>bundle</packaging>
<packaging>jar</packaging>
<dependencies> <dependencies>
<dependency> <dependency>
@ -152,10 +151,6 @@
</resource> </resource>
</resources> </resources>
<plugins> <plugins>
<!--
TODO: BND
With this enabled, JAR file contains a bunch of .class files that
seem to get copied in from org.hl7.fhir.convertors
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
@ -170,7 +165,6 @@
</instructions> </instructions>
</configuration> </configuration>
</plugin> </plugin>
-->
</plugins> </plugins>
</build> </build>
</project> </project>

2
hapi-fhir-converter/src/main/java/ca/uhn/hapi/converters/server/VersionedApiConverterInterceptor.java
View File

@ -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.AuthenticationException;
import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
import ca.uhn.fhir.rest.server.interceptor.InterceptorAdapter; 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.convertors.*;
import org.hl7.fhir.dstu3.model.Resource; import org.hl7.fhir.dstu3.model.Resource;
import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.exceptions.FHIRException;

3
hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/NullVersionConverterAdvisor30.java → hapi-fhir-converter/src/main/java/org/hl7/fhir/converter/NullVersionConverterAdvisor30.java
View File

@ -1,4 +1,4 @@
package org.hl7.fhir.convertors; package org.hl7.fhir.converter;
/* /*
* #%L * #%L
@ -20,6 +20,7 @@ package org.hl7.fhir.convertors;
* #L% * #L%
*/ */
import org.hl7.fhir.convertors.VersionConvertorAdvisor30;
import org.hl7.fhir.dstu3.model.Bundle.BundleEntryComponent; import org.hl7.fhir.dstu3.model.Bundle.BundleEntryComponent;
import org.hl7.fhir.dstu3.model.CodeSystem; import org.hl7.fhir.dstu3.model.CodeSystem;
import org.hl7.fhir.dstu3.model.ValueSet; import org.hl7.fhir.dstu3.model.ValueSet;

3
hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/NullVersionConverterAdvisor40.java → hapi-fhir-converter/src/main/java/org/hl7/fhir/converter/NullVersionConverterAdvisor40.java
View File

@ -1,4 +1,4 @@
package org.hl7.fhir.convertors; package org.hl7.fhir.converter;
/* /*
* #%L * #%L
@ -20,6 +20,7 @@ package org.hl7.fhir.convertors;
* #L% * #L%
*/ */
import org.hl7.fhir.convertors.VersionConvertorAdvisor40;
import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.dstu2.model.Resource; import org.hl7.fhir.dstu2.model.Resource;
import org.hl7.fhir.r4.model.Bundle.BundleEntryComponent; import org.hl7.fhir.r4.model.Bundle.BundleEntryComponent;

3
hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/NullVersionConverterAdvisor50.java → hapi-fhir-converter/src/main/java/org/hl7/fhir/converter/NullVersionConverterAdvisor50.java
View File

@ -1,4 +1,4 @@
package org.hl7.fhir.convertors; package org.hl7.fhir.converter;
/* /*
* #%L * #%L
@ -20,6 +20,7 @@ package org.hl7.fhir.convertors;
* #L% * #L%
*/ */
import org.hl7.fhir.convertors.VersionConvertorAdvisor50;
import org.hl7.fhir.dstu2.model.Resource; import org.hl7.fhir.dstu2.model.Resource;
import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.r5.model.Bundle; import org.hl7.fhir.r5.model.Bundle;

3
hapi-fhir-converter/src/test/java/org/hl7/fhir/convertors/VersionConvertor_10_30Test.java → hapi-fhir-converter/src/test/java/org/hl7/fhir/converter/VersionConvertor_10_30Test.java
View File

@ -1,7 +1,8 @@
package org.hl7.fhir.convertors; package org.hl7.fhir.converter;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import org.hl7.fhir.convertors.VersionConvertor_10_30;
import org.hl7.fhir.dstu3.model.*; import org.hl7.fhir.dstu3.model.*;
import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.dstu2.model.Resource; import org.hl7.fhir.dstu2.model.Resource;

3
hapi-fhir-converter/src/test/java/org/hl7/fhir/convertors/VersionConvertor_14_30Test.java → hapi-fhir-converter/src/test/java/org/hl7/fhir/converter/VersionConvertor_14_30Test.java
View File

@ -1,7 +1,8 @@
package org.hl7.fhir.convertors; package org.hl7.fhir.converter;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import org.hl7.fhir.convertors.VersionConvertor_14_30;
import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.exceptions.FHIRException;
import org.junit.Test; import org.junit.Test;

2
hapi-fhir-docs/src/main/java/ca/uhn/hapi/fhir/docs/ConverterExamples.java
View File

@ -20,7 +20,7 @@ package ca.uhn.hapi.fhir.docs;
* #L% * #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_10_30;
import org.hl7.fhir.convertors.VersionConvertor_14_30; import org.hl7.fhir.convertors.VersionConvertor_14_30;
import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.exceptions.FHIRException;

2
hapi-fhir-validation/src/main/java/org/hl7/fhir/instance/hapi/validation/FhirInstanceValidator.java
View File

@ -15,7 +15,7 @@ import org.apache.commons.lang3.Validate;
import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.fhir.ucum.UcumService; 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.VersionConvertorAdvisor50;
import org.hl7.fhir.convertors.VersionConvertor_10_50; import org.hl7.fhir.convertors.VersionConvertor_10_50;
import org.hl7.fhir.dstu2.model.*; import org.hl7.fhir.dstu2.model.*;