- * Hooks should return an instance of ca.uhn.fhir.jpa.api.model.RequestPartitionId or null.
+ * Hooks must return an instance of ca.uhn.fhir.interceptor.model.RequestPartitionId.
*
- * Hooks should return an instance of ca.uhn.fhir.jpa.api.model.RequestPartitionId or null.
+ * Hooks must return an instance of ca.uhn.fhir.interceptor.model.RequestPartitionId.
*
+ * This hook will only be called if + * partitioning is enabled in the JPA server. + *
+ *+ * Hooks may accept the following parameters: + *
+ *+ * Hooks must return void. + *
+ */ + STORAGE_PARTITION_SELECTED( + // Return type + void.class, + // Params + "ca.uhn.fhir.interceptor.model.RequestPartitionId", + "ca.uhn.fhir.rest.api.server.RequestDetails", + "ca.uhn.fhir.rest.server.servlet.ServletRequestDetails" + ), + /** * Performance Tracing Hook: * This hook is invoked when any informational messages generated by the diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/model/RequestPartitionId.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/model/RequestPartitionId.java index c1d0f8291c1..d66e74208d5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/model/RequestPartitionId.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/model/RequestPartitionId.java @@ -20,27 +20,55 @@ package ca.uhn.fhir.interceptor.model; * #L% */ +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; + import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.time.LocalDate; -import static org.apache.commons.lang3.ObjectUtils.defaultIfNull; - +/** + * @since 5.0.0 + */ public class RequestPartitionId { - private final Integer myPartitionId; + private static final RequestPartitionId ALL_PARTITIONS = new RequestPartitionId(); private final LocalDate myPartitionDate; + private final boolean myAllPartitions; + private final Integer myPartitionId; private final String myPartitionName; /** - * Constructor + * Constructor for a single partition */ private RequestPartitionId(@Nullable String thePartitionName, @Nullable Integer thePartitionId, @Nullable LocalDate thePartitionDate) { - myPartitionName = thePartitionName; myPartitionId = thePartitionId; + myPartitionName = thePartitionName; myPartitionDate = thePartitionDate; + myAllPartitions = false; } + /** + * Constructor for all partitions + */ + private RequestPartitionId() { + super(); + myPartitionDate = null; + myPartitionName = null; + myPartitionId = null; + myAllPartitions = true; + } + + public boolean isAllPartitions() { + return myAllPartitions; + } + + @Nullable + public LocalDate getPartitionDate() { + return myPartitionDate; + } + + @Nullable public String getPartitionName() { return myPartitionName; } @@ -50,32 +78,59 @@ public class RequestPartitionId { return myPartitionId; } - @Nullable - public LocalDate getPartitionDate() { - return myPartitionDate; - } - @Override public String toString() { - return getPartitionIdStringOrNullString(); + return "RequestPartitionId[id=" + getPartitionId() + ", name=" + getPartitionName() + "]"; } /** * Returns the partition ID (numeric) as a string, or the string "null" */ public String getPartitionIdStringOrNullString() { - return defaultIfNull(myPartitionId, "null").toString(); + if (myPartitionId == null) { + return "null"; + } + return myPartitionId.toString(); } - /** - * Create a string representation suitable for use as a cache key. Null aware. - */ - public static String stringifyForKey(RequestPartitionId theRequestPartitionId) { - String retVal = "(null)"; - if (theRequestPartitionId != null) { - retVal = theRequestPartitionId.getPartitionIdStringOrNullString(); + @Override + public boolean equals(Object theO) { + if (this == theO) { + return true; } - return retVal; + + if (theO == null || getClass() != theO.getClass()) { + return false; + } + + RequestPartitionId that = (RequestPartitionId) theO; + + return new EqualsBuilder() + .append(myAllPartitions, that.myAllPartitions) + .append(myPartitionDate, that.myPartitionDate) + .append(myPartitionId, that.myPartitionId) + .append(myPartitionName, that.myPartitionName) + .isEquals(); + } + + @Override + public int hashCode() { + return new HashCodeBuilder(17, 37) + .append(myPartitionDate) + .append(myAllPartitions) + .append(myPartitionId) + .append(myPartitionName) + .toHashCode(); + } + + @Nonnull + public static RequestPartitionId allPartitions() { + return ALL_PARTITIONS; + } + + @Nonnull + public static RequestPartitionId defaultPartition() { + return fromPartitionId(null); } @Nonnull @@ -99,8 +154,23 @@ public class RequestPartitionId { } @Nonnull - public static RequestPartitionId forPartitionNameAndId(@Nullable String thePartitionName, @Nullable Integer thePartitionId, @Nullable LocalDate thePartitionDate) { + public static RequestPartitionId fromPartitionIdAndName(@Nullable Integer thePartitionId, @Nullable String thePartitionName) { + return new RequestPartitionId(thePartitionName, thePartitionId, null); + } + + @Nonnull + public static RequestPartitionId forPartitionIdAndName(@Nullable Integer thePartitionId, @Nullable String thePartitionName, @Nullable LocalDate thePartitionDate) { return new RequestPartitionId(thePartitionName, thePartitionId, thePartitionDate); } + /** + * Create a string representation suitable for use as a cache key. Null aware. + */ + public static String stringifyForKey(RequestPartitionId theRequestPartitionId) { + String retVal = "(null)"; + if (theRequestPartitionId != null) { + retVal = theRequestPartitionId.getPartitionIdStringOrNullString(); + } + return retVal; + } } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/Constants.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/Constants.java index 9628034b3f9..b8d66cac6ce 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/Constants.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/Constants.java @@ -264,6 +264,13 @@ public class Constants { public static final String PARAM_FHIRPATH = "_fhirpath"; public static final String PARAM_TYPE = "_type"; + /** + * {@link org.hl7.fhir.instance.model.api.IBaseResource#getUserData(String) User metadata key} used + * to store the partition ID (if any) associated with the given resource. Value for this + * key will be of type {@link ca.uhn.fhir.interceptor.model.RequestPartitionId}. + */ + public static final String RESOURCE_PARTITION_ID = Constants.class.getName() + "_RESOURCE_PARTITION_ID"; + static { CHARSET_UTF8 = StandardCharsets.UTF_8; CHARSET_US_ASCII = StandardCharsets.ISO_8859_1; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/BaseHttpRequest.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/BaseHttpRequest.java new file mode 100644 index 00000000000..2ced28af0fe --- /dev/null +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/BaseHttpRequest.java @@ -0,0 +1,37 @@ +package ca.uhn.fhir.rest.client.api; + +/*- + * #%L + * HAPI FHIR - Core Library + * %% + * 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% + */ + +public abstract class BaseHttpRequest implements IHttpRequest { + + private UrlSourceEnum myUrlSource; + + @Override + public UrlSourceEnum getUrlSource() { + return myUrlSource; + } + + @Override + public void setUrlSource(UrlSourceEnum theUrlSource) { + myUrlSource = theUrlSource; + } + +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IHttpRequest.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IHttpRequest.java index 62389f6c5b3..a2c7445849f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IHttpRequest.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IHttpRequest.java @@ -60,11 +60,15 @@ public interface IHttpRequest { /** * Return the request URI, or null + * + * @see #getUri() */ String getUri(); /** * Modify the request URI, or null + * + * @see #setUrlSource(UrlSourceEnum) */ void setUri(String theUrl); @@ -79,4 +83,19 @@ public interface IHttpRequest { * @param theHeaderName The header name, e.g. "Accept" (must not be null or blank) */ void removeHeaders(String theHeaderName); + + /** + * Where was the URL from? + * + * @since 5.0.0 + */ + UrlSourceEnum getUrlSource(); + + /** + * Where was the URL from? + * + * @since 5.0.0 + */ + void setUrlSource(UrlSourceEnum theUrlSource); + } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/UrlSourceEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/UrlSourceEnum.java new file mode 100644 index 00000000000..26230194c0a --- /dev/null +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/UrlSourceEnum.java @@ -0,0 +1,35 @@ +package ca.uhn.fhir.rest.client.api; + +/*- + * #%L + * HAPI FHIR - Core Library + * %% + * 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% + */ + +public enum UrlSourceEnum { + + /** + * URL was generated (typically by adding the base URL + other things) + */ + GENERATED, + + /** + * URL was supplied (i.e. it came from a paging link in a bundle) + */ + EXPLICIT + +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/DateRangeParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/DateRangeParam.java index 609a49ebd06..89cb4343942 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/DateRangeParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/DateRangeParam.java @@ -9,9 +9,16 @@ import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; import ca.uhn.fhir.util.DateUtils; import org.hl7.fhir.instance.model.api.IPrimitiveType; -import java.util.*; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.List; +import java.util.Objects; +import java.util.TimeZone; -import static ca.uhn.fhir.rest.param.ParamPrefixEnum.*; +import static ca.uhn.fhir.rest.param.ParamPrefixEnum.EQUAL; +import static ca.uhn.fhir.rest.param.ParamPrefixEnum.GREATERTHAN_OR_EQUALS; +import static ca.uhn.fhir.rest.param.ParamPrefixEnum.LESSTHAN_OR_EQUALS; import static java.lang.String.format; import static org.apache.commons.lang3.StringUtils.isNotBlank; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/DateUtils.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/DateUtils.java index d208e3fe599..58b83b7b630 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/DateUtils.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/DateUtils.java @@ -23,7 +23,12 @@ package ca.uhn.fhir.util; import java.lang.ref.SoftReference; import java.text.ParsePosition; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import java.util.TimeZone; /** * A utility class for parsing and formatting HTTP dates as used in cookies and diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/MetaUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/MetaUtil.java index cd6c9384906..775c274e929 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/MetaUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/MetaUtil.java @@ -96,7 +96,7 @@ public class MetaUtil { value.setValue(theValue); sourceExtension.setValue(value); } else { - ourLog.error(MetaUtil.class.getSimpleName() + ".setSource() not supported on FHIR Version " + theContext.getVersion().getVersion()); + ourLog.debug(MetaUtil.class.getSimpleName() + ".setSource() not supported on FHIR Version " + theContext.getVersion().getVersion()); } } diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IPrimitiveType.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IPrimitiveType.java index 089aba760e7..8a782d961ec 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IPrimitiveType.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IPrimitiveType.java @@ -22,16 +22,26 @@ package org.hl7.fhir.instance.model.api; */ -public interface IPrimitiveType| Name | -Type | -Cardinality | -Description | -
|---|---|---|---|
| id | -Integer | -1..1 | -- The numeric ID for the partition. This value can be any integer, positive or negative or zero. It must not be a value that has already been used. - | -
| name | -Code | -1..1 | -- A code (string) to assign to the partition. - | -
| description | -String | -0..1 | -- An optional description for the partition. - | -
| Name | -Type | -Cardinality | -Description | -
|---|---|---|---|
| id | -Integer | -1..1 | -- The numeric ID for the partition to update. This ID must already exist. - | -
| name | -Code | -1..1 | -- A code (string) to assign to the partition. Note that it is acceptable to change the name of a partition, but this should be done with caution since partition names may be referenced by URLs, caches, etc. - | -
| description | -String | -0..1 | -- An optional description for the partition. - | -
| Name | -Type | -Cardinality | -Description | -
|---|---|---|---|
| id | -Integer | -1..1 | -- The numeric ID for the partition to update. This ID must already exist. - | -
| Name | +Type | +Cardinality | +Description | +
|---|---|---|---|
| id | +Integer | +1..1 | ++ The numeric ID for the partition. This value can be any integer, positive or negative or zero. It must not be a value that has already been used. + | +
| name | +Code | +1..1 | ++ A code (string) to assign to the partition. + | +
| description | +String | +0..1 | ++ An optional description for the partition. + | +
| Name | +Type | +Cardinality | +Description | +
|---|---|---|---|
| id | +Integer | +1..1 | ++ The numeric ID for the partition to update. This ID must already exist. + | +
| name | +Code | +1..1 | ++ A code (string) to assign to the partition. Note that it is acceptable to change the name of a partition, but this should be done with caution since partition names may be referenced by URLs, caches, etc. + | +
| description | +String | +0..1 | ++ An optional description for the partition. + | +
| Name | +Type | +Cardinality | +Description | +
|---|---|---|---|
| id | +Integer | +1..1 | ++ The numeric ID for the partition to update. This ID must already exist. + | +
* This method returns a Collection where each row is an element in the collection. Each element in the collection
* is an object array, where the order matters (the array represents columns returned by the query). Be careful if you change this query in any way.
*/
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceHistoryTableDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceHistoryTableDao.java
index 2366c7d9eaa..63d1779ae2d 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceHistoryTableDao.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IResourceHistoryTableDao.java
@@ -6,13 +6,8 @@ import org.springframework.data.domain.Slice;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.jpa.repository.Temporal;
import org.springframework.data.repository.query.Param;
-import javax.persistence.TemporalType;
-import java.util.Collection;
-import java.util.Date;
-
/*
* #%L
* HAPI FHIR JPA Server
@@ -35,36 +30,6 @@ import java.util.Date;
public interface IResourceHistoryTableDao extends JpaRepository
- *
@@ -47,29 +49,52 @@ public class PartitionManagementProvider {
@Autowired
private FhirContext myCtx;
@Autowired
- private IPartitionLookupSvc myPartitionConfigSvc;
+ private IPartitionLookupSvc myPartitionLookupSvc;
/**
* Add Partition:
* partition-management-add-partitionpartition-management-create-partitionpartition-management-update-partitionpartition-management-delete-partition
- * $partition-management-add-partition
+ * $partition-management-create-partition
*
*/
- @Operation(name = ProviderConstants.PARTITION_MANAGEMENT_ADD_PARTITION)
+ @Operation(name = ProviderConstants.PARTITION_MANAGEMENT_CREATE_PARTITION)
public IBaseParameters addPartition(
@ResourceParam IBaseParameters theRequest,
@OperationParam(name = ProviderConstants.PARTITION_MANAGEMENT_PARTITION_ID, min = 1, max = 1, typeName = "integer") IPrimitiveType
+ * $partition-management-read-partition
+ *
+ */
+ @Operation(name = ProviderConstants.PARTITION_MANAGEMENT_READ_PARTITION, idempotent = true)
+ public IBaseParameters addPartition(
+ @ResourceParam IBaseParameters theRequest,
+ @OperationParam(name = ProviderConstants.PARTITION_MANAGEMENT_PARTITION_ID, min = 1, max = 1, typeName = "integer") IPrimitiveType
@@ -83,9 +108,13 @@ public class PartitionManagementProvider {
@OperationParam(name = ProviderConstants.PARTITION_MANAGEMENT_PARTITION_NAME, min = 1, max = 1, typeName = "code") IPrimitiveType