From 5a3a47c0f46a9db4220f4dead11a000184028269 Mon Sep 17 00:00:00 2001 From: John Grimes Date: Wed, 24 May 2023 10:34:57 +1000 Subject: [PATCH] Update copyright --- .../pathling/support/r4/FhirTraversal.java | 8 +++++++- .../pathling/support/r4/FhirTraversalTest.java | 8 +++++++- .../support/r4/R4FhirConversionSupportTest.java | 14 ++++++++++---- .../au/csiro/pathling/io/CacheableDatabase.java | 17 +++++++++++++++++ .../examples/ExtractFromDatabaseApp.java | 17 +++++++++++++++++ .../pathling/examples/ExtractFromJsonApp.java | 17 +++++++++++++++++ 6 files changed, 75 insertions(+), 6 deletions(-) diff --git a/encoders/src/main/java/au/csiro/pathling/support/r4/FhirTraversal.java b/encoders/src/main/java/au/csiro/pathling/support/r4/FhirTraversal.java index a8876bf180..840c677bb9 100644 --- a/encoders/src/main/java/au/csiro/pathling/support/r4/FhirTraversal.java +++ b/encoders/src/main/java/au/csiro/pathling/support/r4/FhirTraversal.java @@ -1,5 +1,11 @@ /* - * Copyright 2023 Commonwealth Scientific and Industrial Research + * This is a modified version of the Bunsen library, originally published at + * https://github.com/cerner/bunsen. + * + * Bunsen is copyright 2017 Cerner Innovation, Inc., and is licensed under + * the Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0). + * + * These modifications are copyright 2023 Commonwealth Scientific and Industrial Research * Organisation (CSIRO) ABN 41 687 119 230. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/encoders/src/test/java/au/csiro/pathling/support/r4/FhirTraversalTest.java b/encoders/src/test/java/au/csiro/pathling/support/r4/FhirTraversalTest.java index 6e6209518d..117f7d9487 100644 --- a/encoders/src/test/java/au/csiro/pathling/support/r4/FhirTraversalTest.java +++ b/encoders/src/test/java/au/csiro/pathling/support/r4/FhirTraversalTest.java @@ -1,5 +1,11 @@ /* - * Copyright 2023 Commonwealth Scientific and Industrial Research + * This is a modified version of the Bunsen library, originally published at + * https://github.com/cerner/bunsen. + * + * Bunsen is copyright 2017 Cerner Innovation, Inc., and is licensed under + * the Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0). + * + * These modifications are copyright 2023 Commonwealth Scientific and Industrial Research * Organisation (CSIRO) ABN 41 687 119 230. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/encoders/src/test/java/au/csiro/pathling/support/r4/R4FhirConversionSupportTest.java b/encoders/src/test/java/au/csiro/pathling/support/r4/R4FhirConversionSupportTest.java index a8b96e76cd..521dfe8edd 100644 --- a/encoders/src/test/java/au/csiro/pathling/support/r4/R4FhirConversionSupportTest.java +++ b/encoders/src/test/java/au/csiro/pathling/support/r4/R4FhirConversionSupportTest.java @@ -1,5 +1,11 @@ /* - * Copyright 2023 Commonwealth Scientific and Industrial Research + * This is a modified version of the Bunsen library, originally published at + * https://github.com/cerner/bunsen. + * + * Bunsen is copyright 2017 Cerner Innovation, Inc., and is licensed under + * the Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0). + * + * These modifications are copyright 2023 Commonwealth Scientific and Industrial Research * Organisation (CSIRO) ABN 41 687 119 230. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -60,13 +66,13 @@ void testKeepsUnresolvedURNReference() { R4FhirConversionSupport.resolveURNReference(urnReference); assertEquals("urn:uuid:1234", urnReference.getReference()); } - + @Test void testNoOpForNonReferences() { final StringType nonReference = new StringType("someString"); - final StringType nonReferenceCopy = nonReference.copy(); + final StringType nonReferenceCopy = nonReference.copy(); R4FhirConversionSupport.resolveURNReference(nonReference); assertTrue(nonReferenceCopy.equalsDeep(nonReference), "Non-reference should not be modified"); } - + } diff --git a/fhir-server/src/main/java/au/csiro/pathling/io/CacheableDatabase.java b/fhir-server/src/main/java/au/csiro/pathling/io/CacheableDatabase.java index 1fb4ef674e..11048fa516 100644 --- a/fhir-server/src/main/java/au/csiro/pathling/io/CacheableDatabase.java +++ b/fhir-server/src/main/java/au/csiro/pathling/io/CacheableDatabase.java @@ -1,3 +1,20 @@ +/* + * Copyright 2023 Commonwealth Scientific and Industrial Research + * Organisation (CSIRO) ABN 41 687 119 230. + * + * 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. + */ + package au.csiro.pathling.io; import static au.csiro.pathling.io.FileSystemPersistence.safelyJoinPaths; diff --git a/library-api/src/test/java/au/csiro/pathling/examples/ExtractFromDatabaseApp.java b/library-api/src/test/java/au/csiro/pathling/examples/ExtractFromDatabaseApp.java index ee3643b704..57a4b3db26 100644 --- a/library-api/src/test/java/au/csiro/pathling/examples/ExtractFromDatabaseApp.java +++ b/library-api/src/test/java/au/csiro/pathling/examples/ExtractFromDatabaseApp.java @@ -1,3 +1,20 @@ +/* + * Copyright 2023 Commonwealth Scientific and Industrial Research + * Organisation (CSIRO) ABN 41 687 119 230. + * + * 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. + */ + package au.csiro.pathling.examples; import au.csiro.pathling.library.PathlingContext; diff --git a/library-api/src/test/java/au/csiro/pathling/examples/ExtractFromJsonApp.java b/library-api/src/test/java/au/csiro/pathling/examples/ExtractFromJsonApp.java index b7167a3e2a..f9cecff923 100644 --- a/library-api/src/test/java/au/csiro/pathling/examples/ExtractFromJsonApp.java +++ b/library-api/src/test/java/au/csiro/pathling/examples/ExtractFromJsonApp.java @@ -1,3 +1,20 @@ +/* + * Copyright 2023 Commonwealth Scientific and Industrial Research + * Organisation (CSIRO) ABN 41 687 119 230. + * + * 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. + */ + package au.csiro.pathling.examples; import au.csiro.pathling.library.PathlingContext;