From 71fa4f2cb4dc66db60ee90687e6c1b9fb059b904 Mon Sep 17 00:00:00 2001 From: Tadgh Date: Thu, 16 Feb 2023 17:02:14 -0800 Subject: [PATCH] License fixes, new parent --- .../main/java/ca/uhn/fhir/sl/cache/Cache.java | 20 +++++++++++++++++++ .../ca/uhn/fhir/sl/cache/CacheFactory.java | 20 +++++++++++++++++++ .../ca/uhn/fhir/sl/cache/CacheLoader.java | 20 +++++++++++++++++++ .../ca/uhn/fhir/sl/cache/CacheProvider.java | 20 +++++++++++++++++++ .../ca/uhn/fhir/sl/cache/LoadingCache.java | 20 +++++++++++++++++++ .../sl/cache/caffeine/CacheDelegator.java | 20 +++++++++++++++++++ .../fhir/sl/cache/caffeine/CacheProvider.java | 20 +++++++++++++++++++ .../cache/caffeine/LoadingCacheDelegator.java | 20 +++++++++++++++++++ .../fhir/sl/cache/guava/CacheDelegator.java | 20 +++++++++++++++++++ .../fhir/sl/cache/guava/CacheProvider.java | 20 +++++++++++++++++++ .../sl/cache/guava/LoadingCacheDelegator.java | 20 +++++++++++++++++++ hapi-fhir-serviceloaders/pom.xml | 2 +- 12 files changed, 221 insertions(+), 1 deletion(-) diff --git a/hapi-fhir-serviceloaders/hapi-fhir-caching-api/src/main/java/ca/uhn/fhir/sl/cache/Cache.java b/hapi-fhir-serviceloaders/hapi-fhir-caching-api/src/main/java/ca/uhn/fhir/sl/cache/Cache.java index a3ba46319ee..0394306f011 100644 --- a/hapi-fhir-serviceloaders/hapi-fhir-caching-api/src/main/java/ca/uhn/fhir/sl/cache/Cache.java +++ b/hapi-fhir-serviceloaders/hapi-fhir-caching-api/src/main/java/ca/uhn/fhir/sl/cache/Cache.java @@ -1,5 +1,25 @@ package ca.uhn.fhir.sl.cache; +/*- + * #%L + * HAPI FHIR - ServiceLoaders - Caching API + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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.Map; import java.util.concurrent.ExecutionException; import java.util.function.Function; diff --git a/hapi-fhir-serviceloaders/hapi-fhir-caching-api/src/main/java/ca/uhn/fhir/sl/cache/CacheFactory.java b/hapi-fhir-serviceloaders/hapi-fhir-caching-api/src/main/java/ca/uhn/fhir/sl/cache/CacheFactory.java index 928a5059e7a..a462f3224ad 100644 --- a/hapi-fhir-serviceloaders/hapi-fhir-caching-api/src/main/java/ca/uhn/fhir/sl/cache/CacheFactory.java +++ b/hapi-fhir-serviceloaders/hapi-fhir-caching-api/src/main/java/ca/uhn/fhir/sl/cache/CacheFactory.java @@ -1,5 +1,25 @@ package ca.uhn.fhir.sl.cache; +/*- + * #%L + * HAPI FHIR - ServiceLoaders - Caching API + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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.i18n.Msg; import java.util.Iterator; diff --git a/hapi-fhir-serviceloaders/hapi-fhir-caching-api/src/main/java/ca/uhn/fhir/sl/cache/CacheLoader.java b/hapi-fhir-serviceloaders/hapi-fhir-caching-api/src/main/java/ca/uhn/fhir/sl/cache/CacheLoader.java index 9fad635da89..26583cd12c5 100644 --- a/hapi-fhir-serviceloaders/hapi-fhir-caching-api/src/main/java/ca/uhn/fhir/sl/cache/CacheLoader.java +++ b/hapi-fhir-serviceloaders/hapi-fhir-caching-api/src/main/java/ca/uhn/fhir/sl/cache/CacheLoader.java @@ -1,5 +1,25 @@ package ca.uhn.fhir.sl.cache; +/*- + * #%L + * HAPI FHIR - ServiceLoaders - Caching API + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 interface CacheLoader { V load(K var1) throws Exception; } diff --git a/hapi-fhir-serviceloaders/hapi-fhir-caching-api/src/main/java/ca/uhn/fhir/sl/cache/CacheProvider.java b/hapi-fhir-serviceloaders/hapi-fhir-caching-api/src/main/java/ca/uhn/fhir/sl/cache/CacheProvider.java index dd40b0c0bee..fc3af9f0dae 100644 --- a/hapi-fhir-serviceloaders/hapi-fhir-caching-api/src/main/java/ca/uhn/fhir/sl/cache/CacheProvider.java +++ b/hapi-fhir-serviceloaders/hapi-fhir-caching-api/src/main/java/ca/uhn/fhir/sl/cache/CacheProvider.java @@ -1,5 +1,25 @@ package ca.uhn.fhir.sl.cache; +/*- + * #%L + * HAPI FHIR - ServiceLoaders - Caching API + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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 interface CacheProvider { Cache create(long timeoutMillis); diff --git a/hapi-fhir-serviceloaders/hapi-fhir-caching-api/src/main/java/ca/uhn/fhir/sl/cache/LoadingCache.java b/hapi-fhir-serviceloaders/hapi-fhir-caching-api/src/main/java/ca/uhn/fhir/sl/cache/LoadingCache.java index 874bb6ed5e2..97c6adfd38b 100644 --- a/hapi-fhir-serviceloaders/hapi-fhir-caching-api/src/main/java/ca/uhn/fhir/sl/cache/LoadingCache.java +++ b/hapi-fhir-serviceloaders/hapi-fhir-caching-api/src/main/java/ca/uhn/fhir/sl/cache/LoadingCache.java @@ -1,5 +1,25 @@ package ca.uhn.fhir.sl.cache; +/*- + * #%L + * HAPI FHIR - ServiceLoaders - Caching API + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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.Map; import java.util.concurrent.CompletableFuture; diff --git a/hapi-fhir-serviceloaders/hapi-fhir-caching-caffeine/src/main/java/ca/uhn/fhir/sl/cache/caffeine/CacheDelegator.java b/hapi-fhir-serviceloaders/hapi-fhir-caching-caffeine/src/main/java/ca/uhn/fhir/sl/cache/caffeine/CacheDelegator.java index db989865f6a..6cad9a4f26a 100644 --- a/hapi-fhir-serviceloaders/hapi-fhir-caching-caffeine/src/main/java/ca/uhn/fhir/sl/cache/caffeine/CacheDelegator.java +++ b/hapi-fhir-serviceloaders/hapi-fhir-caching-caffeine/src/main/java/ca/uhn/fhir/sl/cache/caffeine/CacheDelegator.java @@ -1,5 +1,25 @@ package ca.uhn.fhir.sl.cache.caffeine; +/*- + * #%L + * HAPI FHIR - ServiceLoaders - Caching Caffeine + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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.Map; import java.util.function.Function; diff --git a/hapi-fhir-serviceloaders/hapi-fhir-caching-caffeine/src/main/java/ca/uhn/fhir/sl/cache/caffeine/CacheProvider.java b/hapi-fhir-serviceloaders/hapi-fhir-caching-caffeine/src/main/java/ca/uhn/fhir/sl/cache/caffeine/CacheProvider.java index 0cfe6a8fd80..ef6d4d9eb14 100644 --- a/hapi-fhir-serviceloaders/hapi-fhir-caching-caffeine/src/main/java/ca/uhn/fhir/sl/cache/caffeine/CacheProvider.java +++ b/hapi-fhir-serviceloaders/hapi-fhir-caching-caffeine/src/main/java/ca/uhn/fhir/sl/cache/caffeine/CacheProvider.java @@ -1,5 +1,25 @@ package ca.uhn.fhir.sl.cache.caffeine; +/*- + * #%L + * HAPI FHIR - ServiceLoaders - Caching Caffeine + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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.concurrent.TimeUnit; import com.github.benmanes.caffeine.cache.Caffeine; diff --git a/hapi-fhir-serviceloaders/hapi-fhir-caching-caffeine/src/main/java/ca/uhn/fhir/sl/cache/caffeine/LoadingCacheDelegator.java b/hapi-fhir-serviceloaders/hapi-fhir-caching-caffeine/src/main/java/ca/uhn/fhir/sl/cache/caffeine/LoadingCacheDelegator.java index 01caa9539df..68035a3275e 100644 --- a/hapi-fhir-serviceloaders/hapi-fhir-caching-caffeine/src/main/java/ca/uhn/fhir/sl/cache/caffeine/LoadingCacheDelegator.java +++ b/hapi-fhir-serviceloaders/hapi-fhir-caching-caffeine/src/main/java/ca/uhn/fhir/sl/cache/caffeine/LoadingCacheDelegator.java @@ -1,5 +1,25 @@ package ca.uhn.fhir.sl.cache.caffeine; +/*- + * #%L + * HAPI FHIR - ServiceLoaders - Caching Caffeine + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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.Map; import ca.uhn.fhir.sl.cache.LoadingCache; diff --git a/hapi-fhir-serviceloaders/hapi-fhir-caching-guava/src/main/java/ca/uhn/fhir/sl/cache/guava/CacheDelegator.java b/hapi-fhir-serviceloaders/hapi-fhir-caching-guava/src/main/java/ca/uhn/fhir/sl/cache/guava/CacheDelegator.java index 3900691be64..5c5841c95c6 100644 --- a/hapi-fhir-serviceloaders/hapi-fhir-caching-guava/src/main/java/ca/uhn/fhir/sl/cache/guava/CacheDelegator.java +++ b/hapi-fhir-serviceloaders/hapi-fhir-caching-guava/src/main/java/ca/uhn/fhir/sl/cache/guava/CacheDelegator.java @@ -1,5 +1,25 @@ package ca.uhn.fhir.sl.cache.guava; +/*- + * #%L + * HAPI FHIR - ServiceLoaders - Caching Guava + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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.Map; import java.util.concurrent.ExecutionException; import java.util.function.Function; diff --git a/hapi-fhir-serviceloaders/hapi-fhir-caching-guava/src/main/java/ca/uhn/fhir/sl/cache/guava/CacheProvider.java b/hapi-fhir-serviceloaders/hapi-fhir-caching-guava/src/main/java/ca/uhn/fhir/sl/cache/guava/CacheProvider.java index aeb76eeb1c4..7cfd03352b7 100644 --- a/hapi-fhir-serviceloaders/hapi-fhir-caching-guava/src/main/java/ca/uhn/fhir/sl/cache/guava/CacheProvider.java +++ b/hapi-fhir-serviceloaders/hapi-fhir-caching-guava/src/main/java/ca/uhn/fhir/sl/cache/guava/CacheProvider.java @@ -1,5 +1,25 @@ package ca.uhn.fhir.sl.cache.guava; +/*- + * #%L + * HAPI FHIR - ServiceLoaders - Caching Guava + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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.concurrent.TimeUnit; import com.google.common.cache.CacheBuilder; diff --git a/hapi-fhir-serviceloaders/hapi-fhir-caching-guava/src/main/java/ca/uhn/fhir/sl/cache/guava/LoadingCacheDelegator.java b/hapi-fhir-serviceloaders/hapi-fhir-caching-guava/src/main/java/ca/uhn/fhir/sl/cache/guava/LoadingCacheDelegator.java index 50d4c337bc1..accd447277c 100644 --- a/hapi-fhir-serviceloaders/hapi-fhir-caching-guava/src/main/java/ca/uhn/fhir/sl/cache/guava/LoadingCacheDelegator.java +++ b/hapi-fhir-serviceloaders/hapi-fhir-caching-guava/src/main/java/ca/uhn/fhir/sl/cache/guava/LoadingCacheDelegator.java @@ -1,5 +1,25 @@ package ca.uhn.fhir.sl.cache.guava; +/*- + * #%L + * HAPI FHIR - ServiceLoaders - Caching Guava + * %% + * Copyright (C) 2014 - 2023 Smile CDR, Inc. + * %% + * 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.Map; import java.util.concurrent.ExecutionException; diff --git a/hapi-fhir-serviceloaders/pom.xml b/hapi-fhir-serviceloaders/pom.xml index 75b3375a0d6..7aa2defcda0 100644 --- a/hapi-fhir-serviceloaders/pom.xml +++ b/hapi-fhir-serviceloaders/pom.xml @@ -6,7 +6,7 @@ hapi-deployable-pom ca.uhn.hapi.fhir 6.4.0 - ../pom.xml + ../hapi-deployable-pom/pom.xml hapi-fhir-serviceloaders