From eee4c75300c6a74a4cd9b99dd0d3ff47de936ff3 Mon Sep 17 00:00:00 2001
From: jamesagnew <jamesagnew@gmail.com>
Date: Wed, 23 Jan 2019 05:57:20 -0500
Subject: [PATCH 1/4] Version bump hibernate

---
 pom.xml                 | 2 +-
 src/changes/changes.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e99d52fdaf3..d9795272a1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -534,7 +534,7 @@
 		<jetty_version>9.4.14.v20181114</jetty_version>
 		<jsr305_version>3.0.2</jsr305_version>
 		<!--<hibernate_version>5.2.10.Final</hibernate_version>-->
-		<hibernate_version>5.4.0.Final</hibernate_version>
+		<hibernate_version>5.4.1.Final</hibernate_version>
 		<!-- Update lucene version when you update hibernate-search version -->
 		<hibernate_search_version>5.11.0.Final</hibernate_search_version>
 		<lucene_version>5.5.5</lucene_version>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 6646dde15ba..b16733c2619 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -19,7 +19,7 @@
 					<ul>
 						<li>Spring (JPA): 5.0.8.RELEASE -&gt; 5.1.3.RELEASE</li>
 						<li>Spring-Data (JPA): 2.0.7.RELEASE -&gt; 2.1.3.RELEASE</li>
-						<li>Hibernate-Core (JPA): 5.3.6.FINAL -&gt; 5.4.0.FINAL</li>
+						<li>Hibernate-Core (JPA): 5.3.6.FINAL -&gt; 5.4.1.FINAL</li>
 						<li>Hibernate-Search (JPA): 5.10.3.FINAL -&gt; 5.11.0.FINAL</li>
 						<li>Thymeleaf (JPA): 3.0.9.RELEASE -&gt; 3.0.11.RELEASE</li>
 						<li>thymeleaf-spring4 (Testpage Overlay) has been replaced with thymeleaf-spring5</li>

From 68fae08f204f72386975294a50e1add1812f8504 Mon Sep 17 00:00:00 2001
From: James Agnew <jamesagnew@gmail.com>
Date: Wed, 23 Jan 2019 08:33:37 -0500
Subject: [PATCH 2/4] Fix casing in base64Binary type

---
 .../fhir/dstu3/model/Base64BinaryType.java    |   2 +-
 .../ca/uhn/fhir/model/ModelDstu3Test.java     |   8 +-
 .../hl7/fhir/r4/model/Base64BinaryType.java   | 156 +++++++++---------
 .../org/hl7/fhir/r4/model/ModelR4Test.java    |  19 +++
 src/changes/changes.xml                       |   4 +
 5 files changed, 109 insertions(+), 80 deletions(-)
 create mode 100644 hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/model/ModelR4Test.java

diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Base64BinaryType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Base64BinaryType.java
index 6c07d2f0a5e..0c92c6d0c0c 100644
--- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Base64BinaryType.java
+++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Base64BinaryType.java
@@ -35,7 +35,7 @@ import ca.uhn.fhir.model.api.annotation.DatatypeDef;
 /**
  * Primitive type "base64Binary" in FHIR: a sequence of bytes represented in base64
  */
-@DatatypeDef(name = "base64binary")
+@DatatypeDef(name = "base64Binary")
 public class Base64BinaryType extends PrimitiveType<byte[]> {
 
   private static final long serialVersionUID = 3L;
diff --git a/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/model/ModelDstu3Test.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/model/ModelDstu3Test.java
index 0e2c2edb6f4..67a7679c23f 100644
--- a/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/model/ModelDstu3Test.java
+++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/model/ModelDstu3Test.java
@@ -46,7 +46,13 @@ public class ModelDstu3Test {
 	@Test
 	public void testSetters() {
 		Claim claim = new Claim();
-		claim.setIdentifier(new ArrayList<Identifier>()).setCareTeam(new ArrayList<CareTeamComponent>());
+		claim.setIdentifier(new ArrayList<>()).setCareTeam(new ArrayList<>());
+	}
+
+	@Test
+	public void testbase64BinaryName() {
+		assertEquals("base64Binary", ourCtx.getElementDefinition("base64binary").getName());
+		assertEquals("base64Binary", ourCtx.getElementDefinition("base64Binary").getName());
 	}
 
 	@Test
diff --git a/hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/model/Base64BinaryType.java b/hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/model/Base64BinaryType.java
index e0813445603..36f7a237b12 100644
--- a/hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/model/Base64BinaryType.java
+++ b/hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/model/Base64BinaryType.java
@@ -1,78 +1,78 @@
-/*
-Copyright (c) 2011+, HL7, Inc
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this 
-   list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, 
-   this list of conditions and the following disclaimer in the documentation 
-   and/or other materials provided with the distribution.
- * Neither the name of HL7 nor the names of its contributors may be used to 
-   endorse or promote products derived from this software without specific 
-   prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
-POSSIBILITY OF SUCH DAMAGE.
-
- */
-package org.hl7.fhir.r4.model;
-
-import org.apache.commons.codec.binary.Base64;
-
-import ca.uhn.fhir.model.api.annotation.DatatypeDef;
-
-/**
- * Primitive type "base64Binary" in FHIR: a sequence of bytes represented in base64
- */
-@DatatypeDef(name="base64binary")
-public class Base64BinaryType extends PrimitiveType<byte[]> {
-
-	private static final long serialVersionUID = 3L;
-
-	/**
-	 * Constructor
-	 */
-	public Base64BinaryType() {
-		super();
-	}
-
-	public Base64BinaryType(byte[] theBytes) {
-		super();
-		setValue(theBytes);
-	}
-
-	public Base64BinaryType(String theValue) {
-		super();
-		setValueAsString(theValue);
-	}
-
-	protected byte[] parse(String theValue) {
-		return Base64.decodeBase64(theValue);
-	}
-
-	protected String encode(byte[] theValue) {
-		return Base64.encodeBase64String(theValue);
-	}
-
-	@Override
-	public Base64BinaryType copy() {
-		Base64BinaryType ret = new Base64BinaryType(getValue());
-    copyValues(ret);
-    return ret;
-	}
-
-	public String fhirType() {
-		return "base64Binary";
-	}
-}
+/*
+Copyright (c) 2011+, HL7, Inc
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this 
+   list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, 
+   this list of conditions and the following disclaimer in the documentation 
+   and/or other materials provided with the distribution.
+ * Neither the name of HL7 nor the names of its contributors may be used to 
+   endorse or promote products derived from this software without specific 
+   prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+POSSIBILITY OF SUCH DAMAGE.
+
+ */
+package org.hl7.fhir.r4.model;
+
+import org.apache.commons.codec.binary.Base64;
+
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+
+/**
+ * Primitive type "base64Binary" in FHIR: a sequence of bytes represented in base64
+ */
+@DatatypeDef(name="base64Binary")
+public class Base64BinaryType extends PrimitiveType<byte[]> {
+
+	private static final long serialVersionUID = 3L;
+
+	/**
+	 * Constructor
+	 */
+	public Base64BinaryType() {
+		super();
+	}
+
+	public Base64BinaryType(byte[] theBytes) {
+		super();
+		setValue(theBytes);
+	}
+
+	public Base64BinaryType(String theValue) {
+		super();
+		setValueAsString(theValue);
+	}
+
+	protected byte[] parse(String theValue) {
+		return Base64.decodeBase64(theValue);
+	}
+
+	protected String encode(byte[] theValue) {
+		return Base64.encodeBase64String(theValue);
+	}
+
+	@Override
+	public Base64BinaryType copy() {
+		Base64BinaryType ret = new Base64BinaryType(getValue());
+    copyValues(ret);
+    return ret;
+	}
+
+	public String fhirType() {
+		return "base64Binary";
+	}
+}
diff --git a/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/model/ModelR4Test.java b/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/model/ModelR4Test.java
new file mode 100644
index 00000000000..3610cad6327
--- /dev/null
+++ b/hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/model/ModelR4Test.java
@@ -0,0 +1,19 @@
+package org.hl7.fhir.r4.model;
+
+import ca.uhn.fhir.context.FhirContext;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class ModelR4Test {
+
+	private static FhirContext ourCtx = FhirContext.forR4();
+
+	@Test
+	public void testbase64BinaryName() {
+		assertEquals("base64Binary", ourCtx.getElementDefinition("base64binary").getName());
+		assertEquals("base64Binary", ourCtx.getElementDefinition("base64Binary").getName());
+	}
+
+
+}
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index b16733c2619..072f559de66 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -320,6 +320,10 @@
 				result in the 10th result being returned). This will now result in an empty
 				response Bundle as would be expected.
 			</action>
+			<action type="fix">
+				The casing of the base64Binary datatype was incorrect in the DSTU3 and R4 model classes.
+				This has been corrected.
+			</action>
 		</release>
 		<release version="3.6.0" date="2018-11-12" description="Food">
 			<action type="add">

From afaa1b065f5cd9edb2294a130fa1118305aad69c Mon Sep 17 00:00:00 2001
From: jamesagnew <jamesagnew@gmail.com>
Date: Wed, 23 Jan 2019 09:38:49 -0500
Subject: [PATCH 3/4] Hivernate back to 5.4.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d9795272a1f..e99d52fdaf3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -534,7 +534,7 @@
 		<jetty_version>9.4.14.v20181114</jetty_version>
 		<jsr305_version>3.0.2</jsr305_version>
 		<!--<hibernate_version>5.2.10.Final</hibernate_version>-->
-		<hibernate_version>5.4.1.Final</hibernate_version>
+		<hibernate_version>5.4.0.Final</hibernate_version>
 		<!-- Update lucene version when you update hibernate-search version -->
 		<hibernate_search_version>5.11.0.Final</hibernate_search_version>
 		<lucene_version>5.5.5</lucene_version>

From 5a08593abdf258850fdf3d01447000364e83bf33 Mon Sep 17 00:00:00 2001
From: Ken Stevens <ken.stevens@sympatico.ca>
Date: Wed, 23 Jan 2019 14:37:34 -0500
Subject: [PATCH 4/4] _id support (#1176)

* added support for _id in in-memory matcher
---
 .../cache/SubscriptionCanonicalizer.java      |  6 +--
 .../matcher/CriteriaResourceMatcher.java      | 54 +++++++++++++------
 .../matcher/InMemorySubscriptionMatcher.java  |  4 +-
 ...scriptionDeliveringRestHookSubscriber.java |  4 +-
 .../InMemorySubscriptionMatcherTestR3.java    | 20 +++----
 src/changes/changes.xml                       |  3 ++
 6 files changed, 56 insertions(+), 35 deletions(-)

diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/cache/SubscriptionCanonicalizer.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/cache/SubscriptionCanonicalizer.java
index b7a3f09ce7c..4199054d76b 100644
--- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/cache/SubscriptionCanonicalizer.java
+++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/cache/SubscriptionCanonicalizer.java
@@ -63,7 +63,7 @@ public class SubscriptionCanonicalizer<S extends IBaseResource> {
 		}
 	}
 
-	protected CanonicalSubscription canonicalizeDstu2(IBaseResource theSubscription) {
+	private CanonicalSubscription canonicalizeDstu2(IBaseResource theSubscription) {
 		ca.uhn.fhir.model.dstu2.resource.Subscription subscription = (ca.uhn.fhir.model.dstu2.resource.Subscription) theSubscription;
 
 		CanonicalSubscription retVal = new CanonicalSubscription();
@@ -82,7 +82,7 @@ public class SubscriptionCanonicalizer<S extends IBaseResource> {
 		return retVal;
 	}
 
-	protected CanonicalSubscription canonicalizeDstu3(IBaseResource theSubscription) {
+	private CanonicalSubscription canonicalizeDstu3(IBaseResource theSubscription) {
 		org.hl7.fhir.dstu3.model.Subscription subscription = (org.hl7.fhir.dstu3.model.Subscription) theSubscription;
 
 		CanonicalSubscription retVal = new CanonicalSubscription();
@@ -210,7 +210,7 @@ public class SubscriptionCanonicalizer<S extends IBaseResource> {
 		return null;
 	}
 
-	protected CanonicalSubscription canonicalizeR4(IBaseResource theSubscription) {
+	private CanonicalSubscription canonicalizeR4(IBaseResource theSubscription) {
 		org.hl7.fhir.r4.model.Subscription subscription = (org.hl7.fhir.r4.model.Subscription) theSubscription;
 
 		CanonicalSubscription retVal = new CanonicalSubscription();
diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/matcher/CriteriaResourceMatcher.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/matcher/CriteriaResourceMatcher.java
index 3e8fabb9aba..34f1793fede 100644
--- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/matcher/CriteriaResourceMatcher.java
+++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/matcher/CriteriaResourceMatcher.java
@@ -20,6 +20,7 @@ package ca.uhn.fhir.jpa.subscription.module.matcher;
  * #L%
  */
 
+import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.RuntimeResourceDefinition;
 import ca.uhn.fhir.context.RuntimeSearchParam;
 import ca.uhn.fhir.jpa.searchparam.MatchUrlService;
@@ -30,8 +31,11 @@ import ca.uhn.fhir.model.api.IQueryParameterType;
 import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.rest.param.BaseParamWithPrefix;
 import ca.uhn.fhir.rest.param.ReferenceParam;
+import ca.uhn.fhir.rest.param.StringParam;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 import org.hl7.fhir.instance.model.api.IAnyResource;
+import org.hl7.fhir.instance.model.api.IBaseResource;
+import org.hl7.fhir.instance.model.api.IIdType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,16 +46,18 @@ import java.util.function.Predicate;
 @Service
 public class CriteriaResourceMatcher {
 
-	public static final String CRITERIA = "CRITERIA";
+	private static final String CRITERIA = "CRITERIA";
 	@Autowired
 	private MatchUrlService myMatchUrlService;
 	@Autowired
 	ISearchParamRegistry mySearchParamRegistry;
+	@Autowired
+	FhirContext myFhirContext;
 
-	public SubscriptionMatchResult match(String theCriteria, RuntimeResourceDefinition theResourceDefinition, ResourceIndexedSearchParams theSearchParams) {
+	public SubscriptionMatchResult match(String theCriteria, IBaseResource theResource, ResourceIndexedSearchParams theSearchParams) {
 		SearchParameterMap searchParameterMap;
 		try {
-			searchParameterMap = myMatchUrlService.translateMatchUrl(theCriteria, theResourceDefinition);
+			searchParameterMap = myMatchUrlService.translateMatchUrl(theCriteria, myFhirContext.getResourceDefinition(theResource));
 		} catch (UnsupportedOperationException e) {
 			return new SubscriptionMatchResult(theCriteria, CRITERIA);
 		}
@@ -63,7 +69,7 @@ public class CriteriaResourceMatcher {
 		for (Map.Entry<String, List<List<? extends IQueryParameterType>>> entry : searchParameterMap.entrySet()) {
 			String theParamName = entry.getKey();
 			List<List<? extends IQueryParameterType>> theAndOrParams = entry.getValue();
-			SubscriptionMatchResult result = matchIdsWithAndOr(theParamName, theAndOrParams, theResourceDefinition, theSearchParams);
+			SubscriptionMatchResult result = matchIdsWithAndOr(theParamName, theAndOrParams, theResource, theSearchParams);
 			if (!result.matched()){
 				return result;
 			}
@@ -72,7 +78,7 @@ public class CriteriaResourceMatcher {
 	}
 
 	// This method is modelled from SearchBuilder.searchForIdsWithAndOr()
-	private SubscriptionMatchResult matchIdsWithAndOr(String theParamName, List<List<? extends IQueryParameterType>> theAndOrParams, RuntimeResourceDefinition theResourceDefinition, ResourceIndexedSearchParams theSearchParams) {
+	private SubscriptionMatchResult matchIdsWithAndOr(String theParamName, List<List<? extends IQueryParameterType>> theAndOrParams, IBaseResource theResource, ResourceIndexedSearchParams theSearchParams) {
 		if (theAndOrParams.isEmpty()) {
 			return new SubscriptionMatchResult(true, CRITERIA);
 		}
@@ -90,30 +96,44 @@ public class CriteriaResourceMatcher {
 		if (hasChain(theAndOrParams)) {
 			return new SubscriptionMatchResult(theParamName, "Chained references are not supported");
 		}
-		if (theParamName.equals(IAnyResource.SP_RES_ID)) {
+		switch (theParamName) {
+			case IAnyResource.SP_RES_ID:
 
-			return new SubscriptionMatchResult(theParamName, CRITERIA);
+				return new SubscriptionMatchResult(matchIdsAndOr(theAndOrParams, theResource), CRITERIA);
 
-		} else if (theParamName.equals(IAnyResource.SP_RES_LANGUAGE)) {
+			case IAnyResource.SP_RES_LANGUAGE:
 
-			return new SubscriptionMatchResult(theParamName, CRITERIA);
+				return new SubscriptionMatchResult(theParamName, CRITERIA);
 
-		} else if (theParamName.equals(Constants.PARAM_HAS)) {
+			case Constants.PARAM_HAS:
 
-			return new SubscriptionMatchResult(theParamName, CRITERIA);
+				return new SubscriptionMatchResult(theParamName, CRITERIA);
 
-		} else if (theParamName.equals(Constants.PARAM_TAG) || theParamName.equals(Constants.PARAM_PROFILE) || theParamName.equals(Constants.PARAM_SECURITY)) {
+			case Constants.PARAM_TAG:
+			case Constants.PARAM_PROFILE:
+			case Constants.PARAM_SECURITY:
 
-			return new SubscriptionMatchResult(theParamName, CRITERIA);
+				return new SubscriptionMatchResult(theParamName, CRITERIA);
 
-		} else {
+			default:
 
-			String resourceName = theResourceDefinition.getName();
-			RuntimeSearchParam paramDef = mySearchParamRegistry.getActiveSearchParam(resourceName, theParamName);
-			return matchResourceParam(theParamName, theAndOrParams, theSearchParams, resourceName, paramDef);
+				String resourceName = myFhirContext.getResourceDefinition(theResource).getName();
+				RuntimeSearchParam paramDef = mySearchParamRegistry.getActiveSearchParam(resourceName, theParamName);
+				return matchResourceParam(theParamName, theAndOrParams, theSearchParams, resourceName, paramDef);
 		}
 	}
 
+	private boolean matchIdsAndOr(List<List<? extends IQueryParameterType>> theAndOrParams, IBaseResource theResource) {
+		return theAndOrParams.stream().allMatch(nextAnd -> matchIdsOr(nextAnd, theResource));
+	}
+	private boolean matchIdsOr(List<? extends IQueryParameterType> theOrParams, IBaseResource theResource) {
+		return theOrParams.stream().anyMatch(param -> param instanceof StringParam && matchId(((StringParam)param).getValue(), theResource.getIdElement()));
+	}
+
+	private boolean matchId(String theValue, IIdType theId) {
+		return theValue.equals(theId.getValue()) || theValue.equals(theId.getIdPart());
+	}
+
 	private SubscriptionMatchResult matchResourceParam(String theParamName, List<List<? extends IQueryParameterType>> theAndOrParams, ResourceIndexedSearchParams theSearchParams, String theResourceName, RuntimeSearchParam theParamDef) {
 		if (theParamDef != null) {
 			switch (theParamDef.getParamType()) {
diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/matcher/InMemorySubscriptionMatcher.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/matcher/InMemorySubscriptionMatcher.java
index 414cac544b0..c7e789b0c37 100644
--- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/matcher/InMemorySubscriptionMatcher.java
+++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/matcher/InMemorySubscriptionMatcher.java
@@ -21,7 +21,6 @@ package ca.uhn.fhir.jpa.subscription.module.matcher;
  */
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.context.RuntimeResourceDefinition;
 import ca.uhn.fhir.jpa.model.entity.ResourceTable;
 import ca.uhn.fhir.jpa.searchparam.extractor.ResourceIndexedSearchParams;
 import ca.uhn.fhir.jpa.searchparam.extractor.ResourceLinkExtractor;
@@ -61,7 +60,6 @@ public class InMemorySubscriptionMatcher implements ISubscriptionMatcher {
 		ResourceIndexedSearchParams searchParams = new ResourceIndexedSearchParams();
 		mySearchParamExtractorService.extractFromResource(searchParams, entity, resource);
 		myResourceLinkExtractor.extractResourceLinks(searchParams, entity, resource, resource.getMeta().getLastUpdated(), myInlineResourceLinkResolver);
-		RuntimeResourceDefinition resourceDefinition = myContext.getResourceDefinition(resource);
-		return myCriteriaResourceMatcher.match(criteria, resourceDefinition, searchParams);
+		return myCriteriaResourceMatcher.match(criteria, resource, searchParams);
 	}
 }
diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/subscriber/SubscriptionDeliveringRestHookSubscriber.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/subscriber/SubscriptionDeliveringRestHookSubscriber.java
index 3358e8ab0cd..0667f7be9f2 100644
--- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/subscriber/SubscriptionDeliveringRestHookSubscriber.java
+++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/subscriber/SubscriptionDeliveringRestHookSubscriber.java
@@ -101,8 +101,8 @@ public class SubscriptionDeliveringRestHookSubscriber extends BaseSubscriptionDe
 		try {
 			operation.execute();
 		} catch (ResourceNotFoundException e) {
-			ourLog.error("Cannot reach " + theMsg.getSubscription().getEndpointUrl());
-			e.printStackTrace();
+			ourLog.error("Cannot reach {} ", theMsg.getSubscription().getEndpointUrl());
+			ourLog.error("Exception: ", e);
 			throw e;
 		}
 	}
diff --git a/hapi-fhir-jpaserver-subscription/src/test/java/ca/uhn/fhir/jpa/subscription/module/matcher/InMemorySubscriptionMatcherTestR3.java b/hapi-fhir-jpaserver-subscription/src/test/java/ca/uhn/fhir/jpa/subscription/module/matcher/InMemorySubscriptionMatcherTestR3.java
index eb0706b2001..ff6b32d436c 100644
--- a/hapi-fhir-jpaserver-subscription/src/test/java/ca/uhn/fhir/jpa/subscription/module/matcher/InMemorySubscriptionMatcherTestR3.java
+++ b/hapi-fhir-jpaserver-subscription/src/test/java/ca/uhn/fhir/jpa/subscription/module/matcher/InMemorySubscriptionMatcherTestR3.java
@@ -12,6 +12,7 @@ import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.Arrays;
+import java.util.Collections;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -39,7 +40,6 @@ public class InMemorySubscriptionMatcherTestR3 extends BaseSubscriptionDstu3Test
 	}
 
 	@Test
-	@Ignore
 	public void testResourceById() {
 
 		ProcedureRequest pr = new ProcedureRequest();
@@ -47,12 +47,12 @@ public class InMemorySubscriptionMatcherTestR3 extends BaseSubscriptionDstu3Test
 		pr.setIntent(ProcedureRequest.ProcedureRequestIntent.ORIGINALORDER);
 
 		assertMatched(pr, "ProcedureRequest?_id=123");
-		assertMatched(pr, "ProcedureRequest?_id=Patient/123");
-		assertMatched(pr, "ProcedureRequest?_id=Patient/123,Patient/999");
-		assertMatched(pr, "ProcedureRequest?_id=Patient/123&_id=Patient/123");
-		assertNotMatched(pr, "ProcedureRequest?_id=Patient/888");
-		assertNotMatched(pr, "ProcedureRequest?_id=Patient/888,Patient/999");
-		assertNotMatched(pr, "ProcedureRequest?_id=Patient/123&_id=Patient/888");
+		assertMatched(pr, "ProcedureRequest?_id=ProcedureRequest/123");
+		assertMatched(pr, "ProcedureRequest?_id=ProcedureRequest/123,ProcedureRequest/999");
+		assertMatched(pr, "ProcedureRequest?_id=ProcedureRequest/123&_id=ProcedureRequest/123");
+		assertNotMatched(pr, "ProcedureRequest?_id=ProcedureRequest/888");
+		assertNotMatched(pr, "ProcedureRequest?_id=ProcedureRequest/888,ProcedureRequest/999");
+		assertNotMatched(pr, "ProcedureRequest?_id=ProcedureRequest/123&_id=ProcedureRequest/888");
 
 	}
 
@@ -301,7 +301,7 @@ public class InMemorySubscriptionMatcherTestR3 extends BaseSubscriptionDstu3Test
 		sp.setXpathUsage(SearchParameter.XPathUsageType.NORMAL);
 		sp.setStatus(Enumerations.PublicationStatus.ACTIVE);
 
-		IBundleProvider bundle = new SimpleBundleProvider(Arrays.asList(sp), "uuid");
+		IBundleProvider bundle = new SimpleBundleProvider(Collections.singletonList(sp), "uuid");
 		initSearchParamRegistry(bundle);
 
 		{
@@ -333,7 +333,7 @@ public class InMemorySubscriptionMatcherTestR3 extends BaseSubscriptionDstu3Test
 		sp.setXpathUsage(SearchParameter.XPathUsageType.NORMAL);
 		sp.setStatus(Enumerations.PublicationStatus.ACTIVE);
 
-		IBundleProvider bundle = new SimpleBundleProvider(Arrays.asList(sp), "uuid");
+		IBundleProvider bundle = new SimpleBundleProvider(Collections.singletonList(sp), "uuid");
 		initSearchParamRegistry(bundle);
 
 		{
@@ -425,7 +425,7 @@ public class InMemorySubscriptionMatcherTestR3 extends BaseSubscriptionDstu3Test
 		sp.setXpathUsage(SearchParameter.XPathUsageType.NORMAL);
 		sp.setStatus(Enumerations.PublicationStatus.ACTIVE);
 
-		IBundleProvider bundle = new SimpleBundleProvider(Arrays.asList(sp), "uuid");
+		IBundleProvider bundle = new SimpleBundleProvider(Collections.singletonList(sp), "uuid");
 		initSearchParamRegistry(bundle);
 
 		{
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 072f559de66..aac1c8be1cc 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -320,6 +320,9 @@
 				result in the 10th result being returned). This will now result in an empty
 				response Bundle as would be expected.
 			</action>
+			<action type="add">
+				Added support for _id in in-memory matcher
+			</action>
 			<action type="fix">
 				The casing of the base64Binary datatype was incorrect in the DSTU3 and R4 model classes.
 				This has been corrected.