theResourceTypes) {
+ myResourceTypes = theResourceTypes;
+ }
+
+ public void setAppliesToAny() {
+ myWantAnyStyle = true;
+ }
+}
diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/SearchNarrowingInterceptor.java_703256810379985 b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/SearchNarrowingInterceptor.java_703256810379985
deleted file mode 100644
index 3ede68f6b6a..00000000000
--- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/SearchNarrowingInterceptor.java_703256810379985
+++ /dev/null
@@ -1,278 +0,0 @@
-package ca.uhn.fhir.rest.server.interceptor.auth;
-
-/*-
- * #%L
- * HAPI FHIR - Server Framework
- * %%
- * Copyright (C) 2014 - 2020 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.context.RuntimeResourceDefinition;
-import ca.uhn.fhir.context.RuntimeSearchParam;
-import ca.uhn.fhir.interceptor.api.Hook;
-import ca.uhn.fhir.interceptor.api.Pointcut;
-import ca.uhn.fhir.rest.api.QualifiedParamList;
-import ca.uhn.fhir.rest.api.RestOperationTypeEnum;
-import ca.uhn.fhir.rest.api.server.RequestDetails;
-import ca.uhn.fhir.rest.param.ParameterUtil;
-import ca.uhn.fhir.rest.server.exceptions.AuthenticationException;
-import ca.uhn.fhir.rest.server.method.BaseMethodBinding;
-import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails;
-import ca.uhn.fhir.rest.server.servlet.ServletSubRequestDetails;
-import ca.uhn.fhir.rest.server.util.ServletRequestUtil;
-import ca.uhn.fhir.util.BundleUtil;
-import ca.uhn.fhir.util.bundle.ModifiableBundleEntry;
-import com.google.common.collect.ArrayListMultimap;
-import org.apache.commons.collections4.ListUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Validate;
-import org.hl7.fhir.instance.model.api.IBaseBundle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.*;
-import java.util.function.Consumer;
-
-/**
- * This interceptor can be used to automatically narrow the scope of searches in order to
- * automatically restrict the searches to specific compartments.
- *
- * For example, this interceptor
- * could be used to restrict a user to only viewing data belonging to Patient/123 (i.e. data
- * in the Patient/123 compartment). In this case, a user performing a search
- * for
- * http://baseurl/Observation?category=laboratory
- * would receive results as though they had requested
- * http://baseurl/Observation?subject=Patient/123&category=laboratory
- *
- *
- * Note that this interceptor should be used in combination with {@link AuthorizationInterceptor}
- * if you are restricting results because of a security restriction. This interceptor is not
- * intended to be a failsafe way of preventing users from seeing the wrong data (that is the
- * purpose of AuthorizationInterceptor). This interceptor is simply intended as a convenience to
- * help users simplify their queries while not receiving security errors for to trying to access
- * data they do not have access to see.
- *
- *
- * @see AuthorizationInterceptor
- */
-public class SearchNarrowingInterceptor {
- private static final Logger ourLog = LoggerFactory.getLogger(SearchNarrowingInterceptor.class);
-
-
- /**
- * Subclasses should override this method to supply the set of compartments that
- * the user making the request should actually have access to.
- *
- * Typically this is done by examining theRequestDetails to find
- * out who the current user is and then building a list of Strings.
- *
- *
- * @param theRequestDetails The individual request currently being applied
- * @return The list of allowed compartments and instances that should be used
- * for search narrowing. If this method returns null, no narrowing will
- * be performed
- */
- protected AuthorizedList buildAuthorizedList(@SuppressWarnings("unused") RequestDetails theRequestDetails) {
- return null;
- }
-
- @Hook(Pointcut.SERVER_INCOMING_REQUEST_POST_PROCESSED)
- public boolean incomingRequestPostProcessed(RequestDetails theRequestDetails, HttpServletRequest theRequest, HttpServletResponse theResponse) throws AuthenticationException {
- // We don't support this operation type yet
- Validate.isTrue(theRequestDetails.getRestOperationType() != RestOperationTypeEnum.SEARCH_SYSTEM);
-
- if (theRequestDetails.getRestOperationType() != RestOperationTypeEnum.SEARCH_TYPE) {
- return true;
- }
-
- FhirContext ctx = theRequestDetails.getServer().getFhirContext();
- RuntimeResourceDefinition resDef = ctx.getResourceDefinition(theRequestDetails.getResourceName());
- HashMap> parameterToOrValues = new HashMap<>();
- AuthorizedList authorizedList = buildAuthorizedList(theRequestDetails);
- if (authorizedList == null) {
- return true;
- }
-
- /*
- * Create a map of search parameter values that need to be added to the
- * given request
- */
- Collection compartments = authorizedList.getAllowedCompartments();
- if (compartments != null) {
- processResourcesOrCompartments(theRequestDetails, resDef, parameterToOrValues, compartments, true);
- }
- Collection resources = authorizedList.getAllowedInstances();
- if (resources != null) {
- processResourcesOrCompartments(theRequestDetails, resDef, parameterToOrValues, resources, false);
- }
-
- /*
- * Add any param values to the actual request
- */
- if (parameterToOrValues.size() > 0) {
- Map newParameters = new HashMap<>(theRequestDetails.getParameters());
- for (Map.Entry> nextEntry : parameterToOrValues.entrySet()) {
- String nextParamName = nextEntry.getKey();
- List nextAllowedValues = nextEntry.getValue();
-
- if (!newParameters.containsKey(nextParamName)) {
-
- /*
- * If we don't already have a parameter of the given type, add one
- */
- String nextValuesJoined = ParameterUtil.escapeAndJoinOrList(nextAllowedValues);
- String[] paramValues = {nextValuesJoined};
- newParameters.put(nextParamName, paramValues);
-
- } else {
-
- /*
- * If the client explicitly requested the given parameter already, we'll
- * just update the request to have the intersection of the values that the client
- * requested, and the values that the user is allowed to see
- */
- String[] existingValues = newParameters.get(nextParamName);
- boolean restrictedExistingList = false;
- for (int i = 0; i < existingValues.length; i++) {
-
- String nextExistingValue = existingValues[i];
- List nextRequestedValues = QualifiedParamList.splitQueryStringByCommasIgnoreEscape(null, nextExistingValue);
- List nextPermittedValues = ListUtils.intersection(nextRequestedValues, nextAllowedValues);
- if (nextPermittedValues.size() > 0) {
- restrictedExistingList = true;
- existingValues[i] = ParameterUtil.escapeAndJoinOrList(nextPermittedValues);
- }
-
- }
-
- /*
- * If none of the values that were requested by the client overlap at all
- * with the values that the user is allowed to see, we'll just add the permitted
- * list as a new list. Ultimately this scenario actually means that the client
- * shouldn't get *any* results back, and adding a new AND parameter (that doesn't
- * overlap at all with the others) is one way of ensuring that.
- */
- if (!restrictedExistingList) {
- String[] newValues = Arrays.copyOf(existingValues, existingValues.length + 1);
- newValues[existingValues.length] = ParameterUtil.escapeAndJoinOrList(nextAllowedValues);
- newParameters.put(nextParamName, newValues);
- }
- }
-
- }
- theRequestDetails.setParameters(newParameters);
- }
-
- return true;
- }
-
- @Hook(Pointcut.SERVER_INCOMING_REQUEST_PRE_HANDLED)
- public void incomingRequestPreHandled(ServletRequestDetails theRequestDetails, HttpServletRequest theRequest, HttpServletResponse theResponse) throws AuthenticationException {
- if (theRequestDetails.getRestOperationType() != RestOperationTypeEnum.TRANSACTION) {
- return;
- }
-
- IBaseBundle bundle = (IBaseBundle) theRequestDetails.getResource();
- FhirContext ctx = theRequestDetails.getFhirContext();
- BundleEntryUrlProcessor processor = new BundleEntryUrlProcessor(ctx, theRequestDetails, theRequest, theResponse);
- BundleUtil.processEntries(ctx, bundle, processor);
- }
-
- private class BundleEntryUrlProcessor implements Consumer {
- private final FhirContext myFhirContext;
- private final ServletRequestDetails myRequestDetails;
- private final HttpServletRequest myRequest;
- private final HttpServletResponse myResponse;
-
- public BundleEntryUrlProcessor(FhirContext theFhirContext, ServletRequestDetails theRequestDetails, HttpServletRequest theRequest, HttpServletResponse theResponse) {
- myFhirContext = theFhirContext;
- myRequestDetails = theRequestDetails;
- myRequest = theRequest;
- myResponse = theResponse;
- }
-
- @Override
- public void accept(ModifiableBundleEntry theModifiableBundleEntry) {
- ArrayListMultimap paramValues = ArrayListMultimap.create();
-
- String url = theModifiableBundleEntry.getRequestUrl();
-
- ServletSubRequestDetails subServletRequestDetails = ServletRequestUtil.getServletSubRequestDetails(myRequestDetails, url, paramValues);
- BaseMethodBinding method = subServletRequestDetails.getServer().determineResourceMethod(subServletRequestDetails, url);
- RestOperationTypeEnum restOperationType = method.getRestOperationType();
- subServletRequestDetails.setRestOperationType(restOperationType);
-
- incomingRequestPostProcessed(subServletRequestDetails, myRequest, myResponse);
-
- theModifiableBundleEntry.setRequestUrl(myFhirContext, ServletRequestUtil.extractUrl(subServletRequestDetails));
- }
- }
-
- private void processResourcesOrCompartments(RequestDetails theRequestDetails, RuntimeResourceDefinition theResDef, HashMap> theParameterToOrValues, Collection theResourcesOrCompartments, boolean theAreCompartments) {
- String lastCompartmentName = null;
- String lastSearchParamName = null;
- for (String nextCompartment : theResourcesOrCompartments) {
- Validate.isTrue(StringUtils.countMatches(nextCompartment, '/') == 1, "Invalid compartment name (must be in form \"ResourceType/xxx\": %s", nextCompartment);
- String compartmentName = nextCompartment.substring(0, nextCompartment.indexOf('/'));
-
- String searchParamName = null;
- if (compartmentName.equalsIgnoreCase(lastCompartmentName)) {
-
- // Avoid doing a lookup for the same thing repeatedly
- searchParamName = lastSearchParamName;
-
- } else {
-
- if (compartmentName.equalsIgnoreCase(theRequestDetails.getResourceName())) {
-
- searchParamName = "_id";
-
- } else if (theAreCompartments) {
-
- List searchParams = theResDef.getSearchParamsForCompartmentName(compartmentName);
- if (searchParams.size() > 0) {
-
- // Resources like Observation have several fields that add the resource to
- // the compartment. In the case of Observation, it's subject, patient and performer.
- // For this kind of thing, we'll prefer the one called "patient".
- RuntimeSearchParam searchParam =
- searchParams
- .stream()
- .filter(t -> t.getName().equalsIgnoreCase(compartmentName))
- .findFirst()
- .orElse(searchParams.get(0));
- searchParamName = searchParam.getName();
-
- }
- }
-
- lastCompartmentName = compartmentName;
- lastSearchParamName = searchParamName;
-
- }
-
- if (searchParamName != null) {
- List orValues = theParameterToOrValues.computeIfAbsent(searchParamName, t -> new ArrayList<>());
- orValues.add(nextCompartment);
- }
- }
- }
-
-}
diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/servlet/ServletRequestDetails.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/servlet/ServletRequestDetails.java
index 8d90901b141..f4598b294d0 100644
--- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/servlet/ServletRequestDetails.java
+++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/servlet/ServletRequestDetails.java
@@ -170,8 +170,9 @@ public class ServletRequestDetails extends RequestDetails {
this.myServer = theServer;
}
- public void setServletRequest(HttpServletRequest myServletRequest) {
+ public ServletRequestDetails setServletRequest(HttpServletRequest myServletRequest) {
this.myServletRequest = myServletRequest;
+ return this;
}
public void setServletResponse(HttpServletResponse myServletResponse) {
diff --git a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/pom.xml b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/pom.xml
index bfea5f3d479..f285a477c43 100644
--- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/pom.xml
+++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
../../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-apache/pom.xml b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-apache/pom.xml
index 8f7f3137d4f..124da03bd6e 100644
--- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-apache/pom.xml
+++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-apache/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-fhir-spring-boot-samples
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
hapi-fhir-spring-boot-sample-client-apache
diff --git a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-okhttp/pom.xml b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-okhttp/pom.xml
index cd8128ce6b9..257a4961dbc 100644
--- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-okhttp/pom.xml
+++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-okhttp/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-fhir-spring-boot-samples
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
hapi-fhir-spring-boot-sample-client-okhttp
diff --git a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-server-jersey/pom.xml b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-server-jersey/pom.xml
index 05de9259624..47a0b93571f 100644
--- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-server-jersey/pom.xml
+++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-server-jersey/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-fhir-spring-boot-samples
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
hapi-fhir-spring-boot-sample-server-jersey
diff --git a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/pom.xml b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/pom.xml
index 60862d9254f..45b3b46cd46 100644
--- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/pom.xml
+++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-fhir-spring-boot
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
hapi-fhir-spring-boot-samples
diff --git a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-starter/pom.xml b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-starter/pom.xml
index ca0c46036e6..25b70dba51f 100644
--- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-starter/pom.xml
+++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
../../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-spring-boot/pom.xml b/hapi-fhir-spring-boot/pom.xml
index 97af4063644..0775b18ecce 100644
--- a/hapi-fhir-spring-boot/pom.xml
+++ b/hapi-fhir-spring-boot/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
../pom.xml
diff --git a/hapi-fhir-structures-dstu2.1/pom.xml b/hapi-fhir-structures-dstu2.1/pom.xml
index 6fb0070529c..830d229f8de 100644
--- a/hapi-fhir-structures-dstu2.1/pom.xml
+++ b/hapi-fhir-structures-dstu2.1/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-structures-dstu2/pom.xml b/hapi-fhir-structures-dstu2/pom.xml
index bfc9539faaf..94bcf37fc10 100644
--- a/hapi-fhir-structures-dstu2/pom.xml
+++ b/hapi-fhir-structures-dstu2/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-structures-dstu3/pom.xml b/hapi-fhir-structures-dstu3/pom.xml
index 2cc4b879e82..10039ffdffc 100644
--- a/hapi-fhir-structures-dstu3/pom.xml
+++ b/hapi-fhir-structures-dstu3/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-structures-hl7org-dstu2/pom.xml b/hapi-fhir-structures-hl7org-dstu2/pom.xml
index efcf2dcafeb..b23232274d7 100644
--- a/hapi-fhir-structures-hl7org-dstu2/pom.xml
+++ b/hapi-fhir-structures-hl7org-dstu2/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-structures-r4/pom.xml b/hapi-fhir-structures-r4/pom.xml
index cf2b45ed0fc..dfce5a3abe4 100644
--- a/hapi-fhir-structures-r4/pom.xml
+++ b/hapi-fhir-structures-r4/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-structures-r5/pom.xml b/hapi-fhir-structures-r5/pom.xml
index 9a6d34dbd2e..9090a3b2a58 100644
--- a/hapi-fhir-structures-r5/pom.xml
+++ b/hapi-fhir-structures-r5/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-test-utilities/pom.xml b/hapi-fhir-test-utilities/pom.xml
index 540bfaf21dc..27d6a374d17 100644
--- a/hapi-fhir-test-utilities/pom.xml
+++ b/hapi-fhir-test-utilities/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-testpage-overlay/pom.xml b/hapi-fhir-testpage-overlay/pom.xml
index 94a6cfa1d83..52a2de32a25 100644
--- a/hapi-fhir-testpage-overlay/pom.xml
+++ b/hapi-fhir-testpage-overlay/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
../pom.xml
diff --git a/hapi-fhir-validation-resources-dstu2.1/pom.xml b/hapi-fhir-validation-resources-dstu2.1/pom.xml
index ec9e0c962f6..17c700593cd 100644
--- a/hapi-fhir-validation-resources-dstu2.1/pom.xml
+++ b/hapi-fhir-validation-resources-dstu2.1/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-validation-resources-dstu2/pom.xml b/hapi-fhir-validation-resources-dstu2/pom.xml
index 569a5ff2911..44505558af6 100644
--- a/hapi-fhir-validation-resources-dstu2/pom.xml
+++ b/hapi-fhir-validation-resources-dstu2/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-validation-resources-dstu3/pom.xml b/hapi-fhir-validation-resources-dstu3/pom.xml
index 62c427d12ae..6befb4fc67d 100644
--- a/hapi-fhir-validation-resources-dstu3/pom.xml
+++ b/hapi-fhir-validation-resources-dstu3/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-validation-resources-r4/pom.xml b/hapi-fhir-validation-resources-r4/pom.xml
index f2bd4f9bf9a..e06ee27e91d 100644
--- a/hapi-fhir-validation-resources-r4/pom.xml
+++ b/hapi-fhir-validation-resources-r4/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-validation-resources-r5/pom.xml b/hapi-fhir-validation-resources-r5/pom.xml
index f6f35ae631e..ed2d29adbde 100644
--- a/hapi-fhir-validation-resources-r5/pom.xml
+++ b/hapi-fhir-validation-resources-r5/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-validation/pom.xml b/hapi-fhir-validation/pom.xml
index 68f1f6e2c97..b13dd6d025f 100644
--- a/hapi-fhir-validation/pom.xml
+++ b/hapi-fhir-validation/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-tinder-plugin/pom.xml b/hapi-tinder-plugin/pom.xml
index 46238460a66..b05cc427088 100644
--- a/hapi-tinder-plugin/pom.xml
+++ b/hapi-tinder-plugin/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
../pom.xml
@@ -58,37 +58,37 @@
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu3
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
ca.uhn.hapi.fhir
hapi-fhir-structures-hl7org-dstu2
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
ca.uhn.hapi.fhir
hapi-fhir-structures-r4
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
ca.uhn.hapi.fhir
hapi-fhir-structures-r5
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
ca.uhn.hapi.fhir
hapi-fhir-validation-resources-dstu2
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
ca.uhn.hapi.fhir
hapi-fhir-validation-resources-dstu3
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
ca.uhn.hapi.fhir
hapi-fhir-validation-resources-r4
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
org.apache.velocity
diff --git a/hapi-tinder-test/pom.xml b/hapi-tinder-test/pom.xml
index 037865e9504..45958f4ce29 100644
--- a/hapi-tinder-test/pom.xml
+++ b/hapi-tinder-test/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
../pom.xml
diff --git a/pom.xml b/pom.xml
index e86b74b08a2..0389868aa73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
ca.uhn.hapi.fhir
hapi-fhir
pom
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
HAPI-FHIR
An open-source implementation of the FHIR specification in Java.
https://hapifhir.io
diff --git a/restful-server-example/pom.xml b/restful-server-example/pom.xml
index 0f26df131b1..887a9e46b58 100644
--- a/restful-server-example/pom.xml
+++ b/restful-server-example/pom.xml
@@ -8,7 +8,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
../pom.xml
diff --git a/tests/hapi-fhir-base-test-jaxrsserver-kotlin/pom.xml b/tests/hapi-fhir-base-test-jaxrsserver-kotlin/pom.xml
index 450eaad555f..11186536ee3 100644
--- a/tests/hapi-fhir-base-test-jaxrsserver-kotlin/pom.xml
+++ b/tests/hapi-fhir-base-test-jaxrsserver-kotlin/pom.xml
@@ -6,7 +6,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
../../pom.xml
diff --git a/tests/hapi-fhir-base-test-mindeps-client/pom.xml b/tests/hapi-fhir-base-test-mindeps-client/pom.xml
index 3a31c0c5b0f..b3f2eed945c 100644
--- a/tests/hapi-fhir-base-test-mindeps-client/pom.xml
+++ b/tests/hapi-fhir-base-test-mindeps-client/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
../../pom.xml
diff --git a/tests/hapi-fhir-base-test-mindeps-server/pom.xml b/tests/hapi-fhir-base-test-mindeps-server/pom.xml
index d83f6cf9097..03c4834d478 100644
--- a/tests/hapi-fhir-base-test-mindeps-server/pom.xml
+++ b/tests/hapi-fhir-base-test-mindeps-server/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 5.5.0-PRE1-SNAPSHOT
+ 5.5.0-PRE2-SNAPSHOT
../../pom.xml
-## Authorizing Write Operations
+# Authorizing Write Operations
Write operations (create, update, etc.) are typically authorized by the interceptor by examining the parsed URL and making a decision about whether to authorize the operation before allowing Resource Provider code to proceed. This means that client code will not have a chance to execute and create resources that the client does not have permissions to create.
@@ -41,9 +41,10 @@ See the following diagram for an example of how this works.
+
-## Authorizing Sub-Operations
+# Authorizing Sub-Operations
There are a number of situations where the REST framework doesn't actually know exactly what operation is going to be performed by the implementing server code. For example, if your server implements a