Header updates

hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/VersionConvertorConstants.java

@@ -1,69 +1,90 @@
-package org.hl7.fhir.convertors;
+package org.hl7.fhir.convertors;
-
+
-import org.hl7.fhir.utilities.Utilities;
+/*-
-
+ * #%L
-public class VersionConvertorConstants {
+ * HAPI FHIR - Converter
-
+ * %%
-  public final static String IG_DEPENDSON_PACKAGE_EXTENSION = "http://hl7.org/fhir/4.0/StructureDefinition/extension-ImplentationGuide.dependency.packageId";
+ * Copyright (C) 2014 - 2018 University Health Network
-  public final static String IG_DEPENDSON_VERSION_EXTENSION = "http://hl7.org/fhir/4.0/StructureDefinition/extension-ImplentationGuide.dependency.version";
+ * %%
-  public final static String MODIFIER_REASON_EXTENSION = "http://hl7.org/fhir/4.0/StructureDefinition/extension-ElementDefinition.isModifierReason";
+ * Licensed under the Apache License, Version 2.0 (the "License");
-  public final static String MODIFIER_REASON_LEGACY = "No Modifier Reason provideed in previous versions of FHIR";
+ * you may not use this file except in compliance with the License.
-  
+ * You may obtain a copy of the License at
-  public static String refToVS(String url) {
+ * 
-    if (url == null)
+ *      http://www.apache.org/licenses/LICENSE-2.0
-      return null;
+ * 
-    if (url.equals("http://www.genenames.org"))
+ * Unless required by applicable law or agreed to in writing, software
-      return "http://hl7.org/fhir/ValueSet/genenames";
+ * distributed under the License is distributed on an "AS IS" BASIS,
-    else if (url.equals("http://varnomen.hgvs.org/"))
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      return "http://hl7.org/fhir/ValueSet/variants";
+ * See the License for the specific language governing permissions and
-    else if (url.equals("http://www.ncbi.nlm.nih.gov/nuccore?db=nuccore"))
+ * limitations under the License.
-      return "http://hl7.org/fhir/ValueSet/ref-sequences";
+ * #L%
-    else if (url.equals("http://www.ensembl.org/"))
+ */
-      return "http://hl7.org/fhir/ValueSet/ensembl";
+
-    else if (url.equals("http://www.ncbi.nlm.nih.gov/clinvar/variation"))
+
-      return "http://hl7.org/fhir/ValueSet/clinvar";
+import org.hl7.fhir.utilities.Utilities;
-    else if (url.equals("http://cancer.sanger.ac.uk/cancergenome/projects/cosmic/"))
+
-      return "http://hl7.org/fhir/ValueSet/cosmic";
+public class VersionConvertorConstants {
-    else if (url.equals("http://www.ncbi.nlm.nih.gov/projects/SNP/"))
+
-      return "http://hl7.org/fhir/ValueSet/bbsnp";
+  public final static String IG_DEPENDSON_PACKAGE_EXTENSION = "http://hl7.org/fhir/4.0/StructureDefinition/extension-ImplentationGuide.dependency.packageId";
-    else if (url.equals("http://www.sequenceontology.org/"))
+  public final static String IG_DEPENDSON_VERSION_EXTENSION = "http://hl7.org/fhir/4.0/StructureDefinition/extension-ImplentationGuide.dependency.version";
-      return "http://hl7.org/fhir/ValueSet/sequenceontology";
+  public final static String MODIFIER_REASON_EXTENSION = "http://hl7.org/fhir/4.0/StructureDefinition/extension-ElementDefinition.isModifierReason";
-    else if (url.equals("http://www.ebi.ac.uk/"))
+  public final static String MODIFIER_REASON_LEGACY = "No Modifier Reason provideed in previous versions of FHIR";
-      return "http://hl7.org/fhir/ValueSet/allelename";
+  
-    else if (url.equals("https://www.iso.org/iso-4217-currency-codes.html"))
+  public static String refToVS(String url) {
-      return "http://hl7.org/fhir/ValueSet/currencies";
+    if (url == null)
-    else if (url.equals("http://www.rfc-editor.org/bcp/bcp13.txt"))
+      return null;
-      return "http://hl7.org/fhir/ValueSet/mimetypes";
+    if (url.equals("http://www.genenames.org"))
-    else
+      return "http://hl7.org/fhir/ValueSet/genenames";
-      return url;
+    else if (url.equals("http://varnomen.hgvs.org/"))
-  }
+      return "http://hl7.org/fhir/ValueSet/variants";
-    
+    else if (url.equals("http://www.ncbi.nlm.nih.gov/nuccore?db=nuccore"))
-  public static String vsToRef(String url) {
+      return "http://hl7.org/fhir/ValueSet/ref-sequences";
-    if (url == null)
+    else if (url.equals("http://www.ensembl.org/"))
-      return null;
+      return "http://hl7.org/fhir/ValueSet/ensembl";
-    if (url.equals("http://hl7.org/fhir/ValueSet/genenames"))
+    else if (url.equals("http://www.ncbi.nlm.nih.gov/clinvar/variation"))
-      return "http://www.genenames.org";
+      return "http://hl7.org/fhir/ValueSet/clinvar";
-    else if (url.equals("http://hl7.org/fhir/ValueSet/variants"))
+    else if (url.equals("http://cancer.sanger.ac.uk/cancergenome/projects/cosmic/"))
-      return "http://varnomen.hgvs.org/";
+      return "http://hl7.org/fhir/ValueSet/cosmic";
-    else if (url.equals("http://hl7.org/fhir/ValueSet/ref-sequences"))
+    else if (url.equals("http://www.ncbi.nlm.nih.gov/projects/SNP/"))
-      return "http://www.ncbi.nlm.nih.gov/nuccore?db=nuccore";
+      return "http://hl7.org/fhir/ValueSet/bbsnp";
-    else if (url.equals("http://hl7.org/fhir/ValueSet/ensembl"))
+    else if (url.equals("http://www.sequenceontology.org/"))
-      return "http://www.ensembl.org/";
+      return "http://hl7.org/fhir/ValueSet/sequenceontology";
-    else if (url.equals("http://hl7.org/fhir/ValueSet/clinvar"))
+    else if (url.equals("http://www.ebi.ac.uk/"))
-      return "http://www.ncbi.nlm.nih.gov/clinvar/variation";
+      return "http://hl7.org/fhir/ValueSet/allelename";
-    else if (url.equals("http://hl7.org/fhir/ValueSet/cosmic"))
+    else if (url.equals("https://www.iso.org/iso-4217-currency-codes.html"))
-      return "http://cancer.sanger.ac.uk/cancergenome/projects/cosmic/";
+      return "http://hl7.org/fhir/ValueSet/currencies";
-    else if (url.equals("http://hl7.org/fhir/ValueSet/bbsnp"))
+    else if (url.equals("http://www.rfc-editor.org/bcp/bcp13.txt"))
-      return "http://www.ncbi.nlm.nih.gov/projects/SNP/";
+      return "http://hl7.org/fhir/ValueSet/mimetypes";
-    else if (url.equals("http://hl7.org/fhir/ValueSet/sequenceontology"))
+    else
-      return "http://www.sequenceontology.org/";
+      return url;
-    else if (url.equals("http://hl7.org/fhir/ValueSet/allelename"))
+  }
-      return "http://www.ebi.ac.uk/";
+    
-    else if (url.equals("http://hl7.org/fhir/ValueSet/currencies"))
+  public static String vsToRef(String url) {
-      return "https://www.iso.org/iso-4217-currency-codes.html";
+    if (url == null)
-    else if (url.equals("http://hl7.org/fhir/ValueSet/mimetypes"))
+      return null;
-      return "http://www.rfc-editor.org/bcp/bcp13.txt";
+    if (url.equals("http://hl7.org/fhir/ValueSet/genenames"))
-    else
+      return "http://www.genenames.org";
-      return null;
+    else if (url.equals("http://hl7.org/fhir/ValueSet/variants"))
-  }
+      return "http://varnomen.hgvs.org/";
-}
+    else if (url.equals("http://hl7.org/fhir/ValueSet/ref-sequences"))
+      return "http://www.ncbi.nlm.nih.gov/nuccore?db=nuccore";
+    else if (url.equals("http://hl7.org/fhir/ValueSet/ensembl"))
+      return "http://www.ensembl.org/";
+    else if (url.equals("http://hl7.org/fhir/ValueSet/clinvar"))
+      return "http://www.ncbi.nlm.nih.gov/clinvar/variation";
+    else if (url.equals("http://hl7.org/fhir/ValueSet/cosmic"))
+      return "http://cancer.sanger.ac.uk/cancergenome/projects/cosmic/";
+    else if (url.equals("http://hl7.org/fhir/ValueSet/bbsnp"))
+      return "http://www.ncbi.nlm.nih.gov/projects/SNP/";
+    else if (url.equals("http://hl7.org/fhir/ValueSet/sequenceontology"))
+      return "http://www.sequenceontology.org/";
+    else if (url.equals("http://hl7.org/fhir/ValueSet/allelename"))
+      return "http://www.ebi.ac.uk/";
+    else if (url.equals("http://hl7.org/fhir/ValueSet/currencies"))
+      return "https://www.iso.org/iso-4217-currency-codes.html";
+    else if (url.equals("http://hl7.org/fhir/ValueSet/mimetypes"))
+      return "http://www.rfc-editor.org/bcp/bcp13.txt";
+    else
+      return null;
+  }
+}

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java

@@ -9,9 +9,9 @@ package ca.uhn.fhir.jpa.config;
  * 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.

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchBuilder.java

@@ -9,9 +9,9 @@ package ca.uhn.fhir.jpa.dao;
  * 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.

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchParameterMap.java

@@ -31,9 +31,9 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
  * 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.

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISearchDao.java

@@ -20,9 +20,9 @@ import java.util.Date;
  * 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.

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISearchResultDao.java

@@ -18,9 +18,9 @@ import org.springframework.data.repository.query.Param;
  * 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.

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/SearchParamExtractorR4.java

@@ -9,9 +9,9 @@ package ca.uhn.fhir.jpa.dao.r4;
  * 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.

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Search.java

@@ -19,9 +19,9 @@ import static org.apache.commons.lang3.StringUtils.left;
  * 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.

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/SubscriptionRetriggeringProvider.java

@@ -1,5 +1,25 @@
 package ca.uhn.fhir.jpa.provider;
 
+/*-
+ * #%L
+ * HAPI FHIR JPA Server
+ * %%
+ * Copyright (C) 2014 - 2018 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 ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.jpa.dao.IFhirResourceDao;
 import ca.uhn.fhir.jpa.dao.IFhirSystemDao;

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImpl.java

@@ -9,9 +9,9 @@ package ca.uhn.fhir.jpa.search;
  * 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.

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/ResourceModifiedMessage.java

@@ -9,9 +9,9 @@ package ca.uhn.fhir.jpa.subscription;
  * 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.

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/ExpungeOptions.java

@@ -9,9 +9,9 @@ package ca.uhn.fhir.jpa.util;
  * 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.

hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/DriverTypeEnum.java

@@ -28,9 +28,9 @@ import java.util.Properties;
  * 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.