diff --git a/Dockerfile b/Dockerfile index f61c4bd6..5021b155 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ # Image for building and running tests against the source code of # the FHIR Access Proxy. -FROM maven:3.8.5-openjdk-11 as build +FROM maven:3.8.7-eclipse-temurin-17-focal as build RUN apt-get update && apt-get install -y nodejs npm RUN npm cache clean -f && npm install -g n && n stable @@ -38,7 +38,7 @@ RUN mvn --batch-mode package -Pstandalone-app -Dlicense.skip=true # Image for FHIR Access Proxy binary with configuration knobs as environment vars. -FROM eclipse-temurin:11-jdk-focal as main +FROM eclipse-temurin:17-jdk-focal as main COPY --from=build /app/exec/target/exec-0.1.1.jar / COPY resources/hapi_page_url_allowed_queries.json resources/hapi_page_url_allowed_queries.json diff --git a/pom.xml b/pom.xml index d34ab307..03aeb414 100644 --- a/pom.xml +++ b/pom.xml @@ -74,13 +74,13 @@ UTF-8 2.32.0 ${project.basedir} - 11 - 11 + 17 + 17 - 1.7.36 - 1.2.11 + 2.0.7 + 1.4.6 4.1 @@ -255,7 +255,7 @@ - 1.8 + 1.15.0 true diff --git a/server/src/main/java/com/google/fhir/gateway/interfaces/AccessDecision.java b/server/src/main/java/com/google/fhir/gateway/interfaces/AccessDecision.java index cc49026f..edaf5ccc 100644 --- a/server/src/main/java/com/google/fhir/gateway/interfaces/AccessDecision.java +++ b/server/src/main/java/com/google/fhir/gateway/interfaces/AccessDecision.java @@ -21,7 +21,9 @@ public interface AccessDecision { - /** @return true iff access was granted. */ + /** + * @return true iff access was granted. + */ boolean canAccess(); /** diff --git a/server/src/main/java/com/google/fhir/gateway/interfaces/RequestMutation.java b/server/src/main/java/com/google/fhir/gateway/interfaces/RequestMutation.java index d1daaee6..fdcac3dd 100644 --- a/server/src/main/java/com/google/fhir/gateway/interfaces/RequestMutation.java +++ b/server/src/main/java/com/google/fhir/gateway/interfaces/RequestMutation.java @@ -1,3 +1,18 @@ +/* + * Copyright 2021-2023 Google LLC + * + * 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 com.google.fhir.gateway.interfaces; import java.util.HashMap;