Refactor to use concrete class instead of parent

hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/Pointcut.java

@@ -1620,7 +1620,7 @@ public enum Pointcut {
 	 * <p>
 	 * Hooks may accept the following parameters:
 	 * <ul>
-	 * <li>ca.uhn.fhir.rest.server.messaging.BaseResourceModifiedMessage- This parameter should not be modified as processing is complete when this hook is invoked.</li>
+	 * <li>ca.uhn.fhir.rest.server.messaging.ConcreteResourceModifiedMessage- This parameter should not be modified as processing is complete when this hook is invoked.</li>
 	 * <li>ca.uhn.fhir.empi.model.TransactionLogMessages - This parameter is for informational messages provided by the EMPI module during EMPI procesing. .</li>
 	 * </ul>
 	 * </p>
@@ -1628,7 +1628,7 @@ public enum Pointcut {
 	 * Hooks should return <code>void</code>.
 	 * </p>
 	 */
-	EMPI_AFTER_PERSISTED_RESOURCE_CHECKED(void.class, "ca.uhn.fhir.rest.server.messaging.BaseResourceModifiedMessage", "ca.uhn.fhir.rest.server.TransactionLogMessages"),
+	EMPI_AFTER_PERSISTED_RESOURCE_CHECKED(void.class, "ca.uhn.fhir.rest.server.messaging.ConcreteResourceModifiedMessage", "ca.uhn.fhir.rest.server.TransactionLogMessages"),
 
 	/**
 	 * <b>Performance Tracing Hook:</b>

hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/broker/EmpiMessageHandler.java

@@ -33,7 +33,7 @@ import ca.uhn.fhir.jpa.subscription.model.ResourceModifiedJsonMessage;
 import ca.uhn.fhir.jpa.subscription.model.ResourceModifiedMessage;
 import ca.uhn.fhir.rest.server.TransactionLogMessages;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
-import ca.uhn.fhir.rest.server.messaging.BaseResourceModifiedMessage;
+import ca.uhn.fhir.rest.server.messaging.ConcreteResourceModifiedMessage;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -94,10 +94,14 @@ public class EmpiMessageHandler implements MessageHandler {
 		}catch (Exception e) {
 			log(empiContext, "Failure during EMPI processing: " + e.getMessage());
 		} finally {
+
 			// Interceptor call: EMPI_AFTER_PERSISTED_RESOURCE_CHECKED
+			ConcreteResourceModifiedMessage outgoingMsg = new ConcreteResourceModifiedMessage(myFhirContext, theMsg.getPayload(myFhirContext), theMsg.getOperationType());
+			outgoingMsg.setTransactionId(theMsg.getTransactionId());
+
 			HookParams params = new HookParams()
 				//Janky upcast.
-				.add(BaseResourceModifiedMessage.class, (BaseResourceModifiedMessage) theMsg)
+				.add(ConcreteResourceModifiedMessage.class,outgoingMsg)
 				.add(TransactionLogMessages.class, empiContext.getTransactionLogMessages());
 			myInterceptorBroadcaster.callHooks(Pointcut.EMPI_AFTER_PERSISTED_RESOURCE_CHECKED, params);
 		}

hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/broker/EmpiQueueConsumerLoader.java

@@ -5,7 +5,7 @@ import ca.uhn.fhir.empi.log.Logs;
 import ca.uhn.fhir.jpa.subscription.channel.api.ChannelConsumerSettings;
 import ca.uhn.fhir.jpa.subscription.channel.api.IChannelFactory;
 import ca.uhn.fhir.jpa.subscription.channel.api.IChannelReceiver;
-import ca.uhn.fhir.rest.server.messaging.json.BaseResourceModifiedJsonMessage;
+import ca.uhn.fhir.rest.server.messaging.json.ConcreteResourceModifiedJsonMessage;
 import com.google.common.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,7 +52,7 @@ public class EmpiQueueConsumerLoader {
 		if (myEmpiChannel == null) {
 			ChannelConsumerSettings config = new ChannelConsumerSettings();
 			config.setConcurrentConsumers(myEmpiSettings.getConcurrentConsumers());
-			myEmpiChannel = myChannelFactory.getOrCreateReceiver(IEmpiSettings.EMPI_CHANNEL_NAME, BaseResourceModifiedJsonMessage.class, config);
+			myEmpiChannel = myChannelFactory.getOrCreateReceiver(IEmpiSettings.EMPI_CHANNEL_NAME, ConcreteResourceModifiedJsonMessage.class, config);
 		}
 
 		if (myEmpiChannel != null) {

hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/message/SubscriptionDeliveringMessageSubscriber.java

@@ -63,7 +63,6 @@ public class SubscriptionDeliveringMessageSubscriber extends BaseSubscriptionDel
 	}
 
 	protected void doDelivery(ResourceDeliveryMessage theMsg, CanonicalSubscription theSubscription, IChannelProducer theChannelProducer, IBaseResource thePayloadResource) {
-		//TODO GGG/KHS Question: is this the point at which we can use a BaseResourceModifiedMessage, since technically we no longer have need of a subscriptionId?
 		ResourceModifiedMessage payload = new ResourceModifiedMessage(myFhirContext, thePayloadResource, theMsg.getOperationType());
 		payload.setTransactionId(theMsg.getTransactionId());
 		ResourceModifiedJsonMessage message = new ResourceModifiedJsonMessage(payload);

hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/BaseResourceModifiedMessage.java

@@ -17,7 +17,7 @@ import java.util.List;
 import static org.apache.commons.lang3.StringUtils.isBlank;
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
-public class BaseResourceModifiedMessage extends BaseResourceMessage implements IResourceMessage, IModelJson {
+public abstract class BaseResourceModifiedMessage extends BaseResourceMessage implements IResourceMessage, IModelJson {
 
 	@JsonProperty("resourceId")
 	protected String myId;

hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/ConcreteResourceModifiedMessage.java

@@ -0,0 +1,18 @@
+package ca.uhn.fhir.rest.server.messaging;
+
+import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.rest.api.server.RequestDetails;
+import org.hl7.fhir.instance.model.api.IBaseResource;
+
+public class ConcreteResourceModifiedMessage extends BaseResourceModifiedMessage {
+	public ConcreteResourceModifiedMessage() {
+	}
+
+	public ConcreteResourceModifiedMessage(FhirContext theFhirContext, IBaseResource theResource, OperationTypeEnum theOperationType) {
+		super(theFhirContext, theResource, theOperationType);
+	}
+
+	public ConcreteResourceModifiedMessage(FhirContext theFhirContext, IBaseResource theNewResource, OperationTypeEnum theOperationType, RequestDetails theRequest) {
+		super(theFhirContext, theNewResource, theOperationType, theRequest);
+	}
+}

hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/json/BaseResourceModifiedJsonMessage.java

@@ -1,49 +0,0 @@
-package ca.uhn.fhir.rest.server.messaging.json;
-
-import ca.uhn.fhir.rest.server.messaging.BaseResourceModifiedMessage;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-public class BaseResourceModifiedJsonMessage extends BaseJsonMessage<BaseResourceModifiedMessage> {
-
-
-	@JsonProperty("payload")
-	private BaseResourceModifiedMessage myPayload;
-
-	/**
-	 * Constructor
-	 */
-	public BaseResourceModifiedJsonMessage() {
-		super();
-	}
-
-	/**
-	 * Constructor
-	 */
-	public BaseResourceModifiedJsonMessage(BaseResourceModifiedMessage thePayload) {
-		myPayload = thePayload;
-		setDefaultRetryHeaders();
-	}
-
-	public BaseResourceModifiedJsonMessage(HapiMessageHeaders theRetryMessageHeaders, BaseResourceModifiedMessage thePayload) {
-		myPayload = thePayload;
-		setHeaders(theRetryMessageHeaders);
-	}
-
-
-	@Override
-	public BaseResourceModifiedMessage getPayload() {
-		return myPayload;
-	}
-
-	public void setPayload(BaseResourceModifiedMessage thePayload) {
-		myPayload = thePayload;
-	}
-
-	@Override
-	public String toString() {
-		return new ToStringBuilder(this)
-			.append("myPayload", myPayload)
-			.toString();
-	}
-}

hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/json/ConcreteResourceModifiedJsonMessage.java

@@ -0,0 +1,49 @@
+package ca.uhn.fhir.rest.server.messaging.json;
+
+import ca.uhn.fhir.rest.server.messaging.ConcreteResourceModifiedMessage;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+public class ConcreteResourceModifiedJsonMessage extends BaseJsonMessage<ConcreteResourceModifiedMessage> {
+
+
+	@JsonProperty("payload")
+	private ConcreteResourceModifiedMessage myPayload;
+
+	/**
+	 * Constructor
+	 */
+	public ConcreteResourceModifiedJsonMessage() {
+		super();
+	}
+
+	/**
+	 * Constructor
+	 */
+	public ConcreteResourceModifiedJsonMessage(ConcreteResourceModifiedMessage thePayload) {
+		myPayload = thePayload;
+		setDefaultRetryHeaders();
+	}
+
+	public ConcreteResourceModifiedJsonMessage(HapiMessageHeaders theRetryMessageHeaders, ConcreteResourceModifiedMessage thePayload) {
+		myPayload = thePayload;
+		setHeaders(theRetryMessageHeaders);
+	}
+
+
+	@Override
+	public ConcreteResourceModifiedMessage getPayload() {
+		return myPayload;
+	}
+
+	public void setPayload(ConcreteResourceModifiedMessage thePayload) {
+		myPayload = thePayload;
+	}
+
+	@Override
+	public String toString() {
+		return new ToStringBuilder(this)
+			.append("myPayload", myPayload)
+			.toString();
+	}
+}

hapi-fhir-server/src/test/java/ca/uhn/fhir/rest/server/messaging/BaseResourceModifiedMessageTest.java

@@ -1,6 +1,6 @@
 package ca.uhn.fhir.rest.server.messaging;
 
-import ca.uhn.fhir.rest.server.messaging.json.BaseResourceModifiedJsonMessage;
+import ca.uhn.fhir.rest.server.messaging.json.ConcreteResourceModifiedJsonMessage;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.Test;
@@ -12,15 +12,15 @@ import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-class BaseResourceModifiedMessageTest {
+class ConcreteResourceModifiedMessageTest {
 
 	@Test
 	public void testSerializationAndDeserializationOfResourceModifiedMessage() throws JsonProcessingException {
-		BaseResourceModifiedJsonMessage jsonMessage = new BaseResourceModifiedJsonMessage();
+		ConcreteResourceModifiedJsonMessage jsonMessage = new ConcreteResourceModifiedJsonMessage();
-		jsonMessage.setPayload(new BaseResourceModifiedMessage());
+		jsonMessage.setPayload(new ConcreteResourceModifiedMessage());
 		ObjectMapper mapper = new ObjectMapper();
 		String serialized = mapper.writeValueAsString(jsonMessage);
-		jsonMessage = mapper.readValue(serialized, BaseResourceModifiedJsonMessage.class);
+		jsonMessage = mapper.readValue(serialized, ConcreteResourceModifiedJsonMessage.class);
 
 		assertThat(jsonMessage.getHapiHeaders().getRetryCount(), is(equalTo(0)));
 		assertThat(jsonMessage.getHapiHeaders().getFirstFailureDate(), is(equalTo(null)));