honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into gg_20201105-remove-person-references

This commit is contained in:
Nick 2020-12-09 09:14:58 -05:00
parent b3a9ab20dc 828573b467
commit 52fd83c654
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/HashMapResourceProvider.java
View File

@ -95,8 +95,8 @@ public class HashMapResourceProvider<T extends IBaseResource> implements IResour
private final Class<T> myResourceType; private final Class<T> myResourceType;
private final FhirContext myFhirContext; private final FhirContext myFhirContext;
private final String myResourceName; private final String myResourceName;
protected Map<String, TreeMap<Long, T>> myIdToVersionToResourceMap = Collections.synchronizedMap(new LinkedHashMap<>()); protected Map<String, TreeMap<Long, T>> myIdToVersionToResourceMap = new LinkedHashMap<>();
protected Map<String, LinkedList<T>> myIdToHistory = Collections.synchronizedMap(new LinkedHashMap<>()); protected Map<String, LinkedList<T>> myIdToHistory = new LinkedHashMap<>();
protected LinkedList<T> myTypeHistory = new LinkedList<>(); protected LinkedList<T> myTypeHistory = new LinkedList<>();
protected AtomicLong mySearchCount = new AtomicLong(0); protected AtomicLong mySearchCount = new AtomicLong(0);
private long myNextId; private long myNextId;
@ -121,7 +121,7 @@ public class HashMapResourceProvider<T extends IBaseResource> implements IResour
/** /**
* Clear all data held in this resource provider * Clear all data held in this resource provider
*/ */
public void clear() { public synchronized void clear() {
myNextId = 1; myNextId = 1;
myIdToVersionToResourceMap.clear(); myIdToVersionToResourceMap.clear();
myIdToHistory.clear(); myIdToHistory.clear();
@ -131,7 +131,7 @@ public class HashMapResourceProvider<T extends IBaseResource> implements IResour
/** /**
* Clear the counts used by {@link #getCountRead()} and other count methods * Clear the counts used by {@link #getCountRead()} and other count methods
*/ */
public void clearCounts() { public synchronized void clearCounts() {
myReadCount.set(0L); myReadCount.set(0L);
myUpdateCount.set(0L); myUpdateCount.set(0L);
myCreateCount.set(0L); myCreateCount.set(0L);
@ -140,7 +140,7 @@ public class HashMapResourceProvider<T extends IBaseResource> implements IResour
} }
@Create @Create
public MethodOutcome create(@ResourceParam T theResource, RequestDetails theRequestDetails) { public synchronized MethodOutcome create(@ResourceParam T theResource, RequestDetails theRequestDetails) {
TransactionDetails transactionDetails = new TransactionDetails(); TransactionDetails transactionDetails = new TransactionDetails();
createInternal(theResource, theRequestDetails, transactionDetails); createInternal(theResource, theRequestDetails, transactionDetails);
@ -158,12 +158,14 @@ public class HashMapResourceProvider<T extends IBaseResource> implements IResour
String idPartAsString = Long.toString(idPart); String idPartAsString = Long.toString(idPart);
Long versionIdPart = 1L; Long versionIdPart = 1L;
assert !myIdToVersionToResourceMap.containsKey(idPartAsString);
IIdType id = store(theResource, idPartAsString, versionIdPart, theRequestDetails, theTransactionDetails); IIdType id = store(theResource, idPartAsString, versionIdPart, theRequestDetails, theTransactionDetails);
theResource.setId(id); theResource.setId(id);
} }
@Delete @Delete
public MethodOutcome delete(@IdParam IIdType theId, RequestDetails theRequestDetails) { public synchronized MethodOutcome delete(@IdParam IIdType theId, RequestDetails theRequestDetails) {
TransactionDetails transactionDetails = new TransactionDetails(); TransactionDetails transactionDetails = new TransactionDetails();
TreeMap<Long, T> versions = myIdToVersionToResourceMap.get(theId.getIdPart()); TreeMap<Long, T> versions = myIdToVersionToResourceMap.get(theId.getIdPart());
@ -185,7 +187,7 @@ public class HashMapResourceProvider<T extends IBaseResource> implements IResour
* This method returns a simple operation count. This is mostly * This method returns a simple operation count. This is mostly
* useful for testing purposes. * useful for testing purposes.
*/ */
public long getCountCreate() { public synchronized long getCountCreate() {
return myCreateCount.get(); return myCreateCount.get();
} }
@ -193,7 +195,7 @@ public class HashMapResourceProvider<T extends IBaseResource> implements IResour
* This method returns a simple operation count. This is mostly * This method returns a simple operation count. This is mostly
* useful for testing purposes. * useful for testing purposes.
*/ */
public long getCountDelete() { public synchronized long getCountDelete() {
return myDeleteCount.get(); return myDeleteCount.get();
} }
@ -201,7 +203,7 @@ public class HashMapResourceProvider<T extends IBaseResource> implements IResour
* This method returns a simple operation count. This is mostly * This method returns a simple operation count. This is mostly
* useful for testing purposes. * useful for testing purposes.
*/ */
public long getCountRead() { public synchronized long getCountRead() {
return myReadCount.get(); return myReadCount.get();
} }
@ -209,7 +211,7 @@ public class HashMapResourceProvider<T extends IBaseResource> implements IResour
* This method returns a simple operation count. This is mostly * This method returns a simple operation count. This is mostly
* useful for testing purposes. * useful for testing purposes.
*/ */
public long getCountSearch() { public synchronized long getCountSearch() {
return mySearchCount.get(); return mySearchCount.get();
} }
@ -217,7 +219,7 @@ public class HashMapResourceProvider<T extends IBaseResource> implements IResour
* This method returns a simple operation count. This is mostly * This method returns a simple operation count. This is mostly
* useful for testing purposes. * useful for testing purposes.
*/ */
public long getCountUpdate() { public synchronized long getCountUpdate() {
return myUpdateCount.get(); return myUpdateCount.get();
} }
@ -226,13 +228,13 @@ public class HashMapResourceProvider<T extends IBaseResource> implements IResour
return myResourceType; return myResourceType;
} }
private synchronized TreeMap<Long, T> getVersionToResource(String theIdPart) { private TreeMap<Long, T> getVersionToResource(String theIdPart) {
myIdToVersionToResourceMap.computeIfAbsent(theIdPart, t -> new TreeMap<>()); myIdToVersionToResourceMap.computeIfAbsent(theIdPart, t -> new TreeMap<>());
return myIdToVersionToResourceMap.get(theIdPart); return myIdToVersionToResourceMap.get(theIdPart);
} }
@History @History
public List<IBaseResource> historyInstance(@IdParam IIdType theId, RequestDetails theRequestDetails) { public synchronized List<IBaseResource> historyInstance(@IdParam IIdType theId, RequestDetails theRequestDetails) {
LinkedList<T> retVal = myIdToHistory.get(theId.getIdPart()); LinkedList<T> retVal = myIdToHistory.get(theId.getIdPart());
if (retVal == null) { if (retVal == null) {
throw new ResourceNotFoundException(theId); throw new ResourceNotFoundException(theId);
@ -247,7 +249,7 @@ public class HashMapResourceProvider<T extends IBaseResource> implements IResour
} }
@Read(version = true) @Read(version = true)
public T read(@IdParam IIdType theId, RequestDetails theRequestDetails) { public synchronized T read(@IdParam IIdType theId, RequestDetails theRequestDetails) {
TreeMap<Long, T> versions = myIdToVersionToResourceMap.get(theId.getIdPart()); TreeMap<Long, T> versions = myIdToVersionToResourceMap.get(theId.getIdPart());
if (versions == null || versions.isEmpty()) { if (versions == null || versions.isEmpty()) {
throw new ResourceNotFoundException(theId); throw new ResourceNotFoundException(theId);
@ -280,14 +282,14 @@ public class HashMapResourceProvider<T extends IBaseResource> implements IResour
} }
@Search @Search
public List<IBaseResource> searchAll(RequestDetails theRequestDetails) { public synchronized List<IBaseResource> searchAll(RequestDetails theRequestDetails) {
mySearchCount.incrementAndGet(); mySearchCount.incrementAndGet();
List<T> retVal = getAllResources(); List<T> retVal = getAllResources();
return fireInterceptorsAndFilterAsNeeded(retVal, theRequestDetails); return fireInterceptorsAndFilterAsNeeded(retVal, theRequestDetails);
} }
@Nonnull @Nonnull
protected List<T> getAllResources() { protected synchronized List<T> getAllResources() {
List<T> retVal = new ArrayList<>(); List<T> retVal = new ArrayList<>();
for (TreeMap<Long, T> next : myIdToVersionToResourceMap.values()) { for (TreeMap<Long, T> next : myIdToVersionToResourceMap.values()) {
@ -303,7 +305,7 @@ public class HashMapResourceProvider<T extends IBaseResource> implements IResour
} }
@Search @Search
public List<IBaseResource> searchById( public synchronized List<IBaseResource> searchById(
@RequiredParam(name = "_id") TokenAndListParam theIds, RequestDetails theRequestDetails) { @RequiredParam(name = "_id") TokenAndListParam theIds, RequestDetails theRequestDetails) {
List<T> retVal = new ArrayList<>(); List<T> retVal = new ArrayList<>();
@ -424,7 +426,7 @@ public class HashMapResourceProvider<T extends IBaseResource> implements IResour
* @param theConditional This is provided only so that subclasses can implement if they want * @param theConditional This is provided only so that subclasses can implement if they want
*/ */
@Update @Update
public MethodOutcome update( public synchronized MethodOutcome update(
@ResourceParam T theResource, @ResourceParam T theResource,
@ConditionalUrlParam String theConditional, @ConditionalUrlParam String theConditional,
RequestDetails theRequestDetails) { RequestDetails theRequestDetails) {
@ -472,7 +474,7 @@ public class HashMapResourceProvider<T extends IBaseResource> implements IResour
* @param theResource The resource to store. If the resource has an ID, that ID is updated. * @param theResource The resource to store. If the resource has an ID, that ID is updated.
* @return Return the ID assigned to the stored resource * @return Return the ID assigned to the stored resource
*/ */
public IIdType store(T theResource) { public synchronized IIdType store(T theResource) {
if (theResource.getIdElement().hasIdPart()) { if (theResource.getIdElement().hasIdPart()) {
updateInternal(theResource, null, new TransactionDetails()); updateInternal(theResource, null, new TransactionDetails());
} else { } else {
@ -486,7 +488,7 @@ public class HashMapResourceProvider<T extends IBaseResource> implements IResour
* *
* @since 4.1.0 * @since 4.1.0
*/ */
public List<T> getStoredResources() { public synchronized List<T> getStoredResources() {
List<T> retVal = new ArrayList<>(); List<T> retVal = new ArrayList<>();
for (TreeMap<Long, T> next : myIdToVersionToResourceMap.values()) { for (TreeMap<Long, T> next : myIdToVersionToResourceMap.values()) {
retVal.add(next.lastEntry().getValue()); retVal.add(next.lastEntry().getValue());