From 295e9ec18519b1814e0378c8788dabc4b5da1738 Mon Sep 17 00:00:00 2001 From: James Date: Fri, 17 Mar 2017 21:49:08 -0400 Subject: [PATCH] Updates for 2.3 --- .../pom.xml | 7 ++++++ .../rest/gclient/IOperationProcessMsg.java | 20 ++++++++++++++++ .../fhir/rest/server/BasePagingProvider.java | 2 +- .../fhir/utilities/TranslatingUtilities.java | 23 ++++++++++++++++++- .../validation/ValidationMessage.java | 23 ++++++++++++++++++- .../fhir/utilities/xhtml/XhtmlComposer.java | 23 ++++++++++++++++++- .../hl7/fhir/convertors/CCDAConverter.java | 23 ++++++++++++++++++- .../org/hl7/fhir/convertors/CDAUtilities.java | 23 ++++++++++++++++++- .../hl7/fhir/convertors/CcdaExtensions.java | 23 ++++++++++++++++++- .../java/org/hl7/fhir/convertors/Convert.java | 23 ++++++++++++++++++- .../hl7/fhir/convertors/ConverterBase.java | 23 ++++++++++++++++++- .../NullVersionConverterAdvisor.java | 20 ++++++++++++++++ .../convertors/VersionConvertorAdvisor.java | 23 ++++++++++++++++++- .../convertors/VersionConvertor_10_20.java | 23 ++++++++++++++++++- .../convertors/VersionConvertor_14_20.java | 23 ++++++++++++++++++- .../fhir/dstu2/utils/ToolingExtensions.java | 23 ++++++++++++++++++- .../java/org/hl7/fhir/utilities/OIDUtils.java | 23 ++++++++++++++++++- .../hl7/fhir/utilities/ucum/UcumService.java | 20 ++++++++++++++++ 18 files changed, 354 insertions(+), 14 deletions(-) diff --git a/example-projects/hapi-fhir-standalone-overlay-example/pom.xml b/example-projects/hapi-fhir-standalone-overlay-example/pom.xml index 09d401e1377..3ff263124e5 100644 --- a/example-projects/hapi-fhir-standalone-overlay-example/pom.xml +++ b/example-projects/hapi-fhir-standalone-overlay-example/pom.xml @@ -31,6 +31,13 @@ true + + org.apache.maven.plugins + maven-deploy-plugin + + true + + diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationProcessMsg.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationProcessMsg.java index 05bf45d7d08..301f7e94b75 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationProcessMsg.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationProcessMsg.java @@ -5,6 +5,26 @@ */ package ca.uhn.fhir.rest.gclient; +/* + * #%L + * HAPI FHIR - Core Library + * %% + * Copyright (C) 2014 - 2017 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + import org.hl7.fhir.instance.model.api.IBaseBundle; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/BasePagingProvider.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/BasePagingProvider.java index c6938c84637..ee3c7bcf740 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/BasePagingProvider.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/BasePagingProvider.java @@ -53,4 +53,4 @@ public abstract class BasePagingProvider implements IPagingProvider { return this; } -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/utilities/TranslatingUtilities.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/utilities/TranslatingUtilities.java index 086d3d7097e..ea5bd6e3f8d 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/utilities/TranslatingUtilities.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/utilities/TranslatingUtilities.java @@ -1,4 +1,25 @@ -package org.hl7.fhir.utilities; +package org.hl7.fhir.utilities; + +/* + * #%L + * HAPI FHIR - Core Library + * %% + * Copyright (C) 2014 - 2017 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + import java.util.Date; diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/utilities/validation/ValidationMessage.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/utilities/validation/ValidationMessage.java index 90f26b7b92e..443c91a7148 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/utilities/validation/ValidationMessage.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/utilities/validation/ValidationMessage.java @@ -1,4 +1,25 @@ -package org.hl7.fhir.utilities.validation; +package org.hl7.fhir.utilities.validation; + +/* + * #%L + * HAPI FHIR - Core Library + * %% + * Copyright (C) 2014 - 2017 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + /* Copyright (c) 2011+, HL7, Inc diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlComposer.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlComposer.java index b79bc541864..252429655b0 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlComposer.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlComposer.java @@ -26,7 +26,28 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hl7.fhir.utilities.xhtml; +package org.hl7.fhir.utilities.xhtml; + +/* + * #%L + * HAPI FHIR - Core Library + * %% + * Copyright (C) 2014 - 2017 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + import java.io.FileOutputStream; import java.io.IOException; diff --git a/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/CCDAConverter.java b/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/CCDAConverter.java index 528efb5ef08..4f3d112b04a 100644 --- a/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/CCDAConverter.java +++ b/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/CCDAConverter.java @@ -1,4 +1,25 @@ -package org.hl7.fhir.convertors; +package org.hl7.fhir.convertors; + +/* + * #%L + * HAPI FHIR - Converter + * %% + * Copyright (C) 2014 - 2017 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + /* diff --git a/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/CDAUtilities.java b/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/CDAUtilities.java index f18b902d985..fbd7b3a19eb 100644 --- a/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/CDAUtilities.java +++ b/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/CDAUtilities.java @@ -1,4 +1,25 @@ -package org.hl7.fhir.convertors; +package org.hl7.fhir.convertors; + +/* + * #%L + * HAPI FHIR - Converter + * %% + * Copyright (C) 2014 - 2017 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + /* diff --git a/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/CcdaExtensions.java b/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/CcdaExtensions.java index b7e62ed311b..9ef87da1412 100644 --- a/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/CcdaExtensions.java +++ b/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/CcdaExtensions.java @@ -1,4 +1,25 @@ -package org.hl7.fhir.convertors; +package org.hl7.fhir.convertors; + +/* + * #%L + * HAPI FHIR - Converter + * %% + * Copyright (C) 2014 - 2017 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + public class CcdaExtensions { public final static String DAF_NAME_RACE = "http://hl7.org/fhir/StructureDefinition/us-core-race"; diff --git a/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/Convert.java b/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/Convert.java index 089b2caf359..bea63267e89 100644 --- a/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/Convert.java +++ b/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/Convert.java @@ -1,4 +1,25 @@ -package org.hl7.fhir.convertors; +package org.hl7.fhir.convertors; + +/* + * #%L + * HAPI FHIR - Converter + * %% + * Copyright (C) 2014 - 2017 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + /* diff --git a/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/ConverterBase.java b/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/ConverterBase.java index 44998e1a9f2..613556746d3 100644 --- a/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/ConverterBase.java +++ b/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/ConverterBase.java @@ -1,4 +1,25 @@ -package org.hl7.fhir.convertors; +package org.hl7.fhir.convertors; + +/* + * #%L + * HAPI FHIR - Converter + * %% + * Copyright (C) 2014 - 2017 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + public class ConverterBase { diff --git a/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/NullVersionConverterAdvisor.java b/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/NullVersionConverterAdvisor.java index f9c07aa95a0..1731c98c7d8 100644 --- a/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/NullVersionConverterAdvisor.java +++ b/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/NullVersionConverterAdvisor.java @@ -1,5 +1,25 @@ package org.hl7.fhir.convertors; +/* + * #%L + * HAPI FHIR - Converter + * %% + * Copyright (C) 2014 - 2017 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + 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/VersionConvertorAdvisor.java b/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/VersionConvertorAdvisor.java index f663236d666..785f53c8d3b 100644 --- a/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/VersionConvertorAdvisor.java +++ b/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/VersionConvertorAdvisor.java @@ -1,4 +1,25 @@ -package org.hl7.fhir.convertors; +package org.hl7.fhir.convertors; + +/* + * #%L + * HAPI FHIR - Converter + * %% + * Copyright (C) 2014 - 2017 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + 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/VersionConvertor_10_20.java b/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_20.java index e6a79cb2228..ed8acdf4260 100644 --- a/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_20.java +++ b/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_20.java @@ -1,4 +1,25 @@ -package org.hl7.fhir.convertors; +package org.hl7.fhir.convertors; + +/* + * #%L + * HAPI FHIR - Converter + * %% + * Copyright (C) 2014 - 2017 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + import java.util.ArrayList; import java.util.List; diff --git a/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_20.java b/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_20.java index 64a422ade25..04c73265d33 100644 --- a/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_20.java +++ b/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_20.java @@ -1,4 +1,25 @@ -package org.hl7.fhir.convertors; +package org.hl7.fhir.convertors; + +/* + * #%L + * HAPI FHIR - Converter + * %% + * Copyright (C) 2014 - 2017 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + /* Copyright (c) 2011+, HL7, Inc. diff --git a/hapi-fhir-converter/src/main/java/org/hl7/fhir/dstu2/utils/ToolingExtensions.java b/hapi-fhir-converter/src/main/java/org/hl7/fhir/dstu2/utils/ToolingExtensions.java index e7ee3f301c2..f711a7af1bd 100644 --- a/hapi-fhir-converter/src/main/java/org/hl7/fhir/dstu2/utils/ToolingExtensions.java +++ b/hapi-fhir-converter/src/main/java/org/hl7/fhir/dstu2/utils/ToolingExtensions.java @@ -1,4 +1,25 @@ -package org.hl7.fhir.dstu2.utils; +package org.hl7.fhir.dstu2.utils; + +/* + * #%L + * HAPI FHIR - Converter + * %% + * Copyright (C) 2014 - 2017 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + import java.net.URISyntaxException; diff --git a/hapi-fhir-converter/src/main/java/org/hl7/fhir/utilities/OIDUtils.java b/hapi-fhir-converter/src/main/java/org/hl7/fhir/utilities/OIDUtils.java index 2a90a74e5ae..4957ae3660d 100644 --- a/hapi-fhir-converter/src/main/java/org/hl7/fhir/utilities/OIDUtils.java +++ b/hapi-fhir-converter/src/main/java/org/hl7/fhir/utilities/OIDUtils.java @@ -1,4 +1,25 @@ -package org.hl7.fhir.utilities; +package org.hl7.fhir.utilities; + +/* + * #%L + * HAPI FHIR - Converter + * %% + * Copyright (C) 2014 - 2017 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + public class OIDUtils { diff --git a/hapi-fhir-converter/src/main/java/org/hl7/fhir/utilities/ucum/UcumService.java b/hapi-fhir-converter/src/main/java/org/hl7/fhir/utilities/ucum/UcumService.java index 5f0c6984596..dc39030e5b6 100644 --- a/hapi-fhir-converter/src/main/java/org/hl7/fhir/utilities/ucum/UcumService.java +++ b/hapi-fhir-converter/src/main/java/org/hl7/fhir/utilities/ucum/UcumService.java @@ -1,5 +1,25 @@ package org.hl7.fhir.utilities.ucum; +/* + * #%L + * HAPI FHIR - Converter + * %% + * Copyright (C) 2014 - 2017 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + /******************************************************************************* * Crown Copyright (c) 2006+, Copyright (c) 2006 - 2014 Kestral Computing & Health Intersections. * All rights reserved. This program and the accompanying materials