Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow overriding message broker ChannelSettings in MDM #6497

Merged
merged 5 commits into from
Dec 12, 2024
+23 −7
Merged

Allow overriding message broker ChannelSettings in MDM #6497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2602dc9
Add support for disabling prefixChannelName to message broker Channel…
volodymyr-korzh Nov 22, 2024
0737737
Add support for disabling ChannelNamePrefix to message broker Channel…
volodymyr-korzh Dec 4, 2024
b947089
Merge remote-tracking branch 'origin/master' into 6496-add-support-fo…
volodymyr-korzh Dec 9, 2024
ee2d2ad
Added support for overriding message broker channel settings for MDM …
volodymyr-korzh Dec 9, 2024
713d861
Added support for overriding message broker channel settings for MDM …
volodymyr-korzh Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .../ca/uhn/hapi/fhir/changelog/7_8_0/6496-add-support-for-mdm-channel-settings-override.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
type: add
issue: 6496
title: "Added support for overriding message broker channel settings for MDM message processing."
6 changes: 5 additions & 1 deletion hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmQueueConsumerLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,13 @@ public MdmQueueConsumerLoader(
startListeningToMdmChannel();
}

protected ChannelConsumerSettings getChannelConsumerSettings() {
return new ChannelConsumerSettings();
}

private void startListeningToMdmChannel() {
if (myMdmChannel == null) {
ChannelConsumerSettings config = new ChannelConsumerSettings();
ChannelConsumerSettings config = getChannelConsumerSettings();

config.setConcurrentConsumers(myMdmSettings.getConcurrentConsumers());

Expand Down
4 changes: 2 additions & 2 deletions hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmConsumerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ IMdmStorageInterceptor mdmStorageInterceptor() {
}

@Bean
MdmQueueConsumerLoader mdmQueueConsumerLoader(
public MdmQueueConsumerLoader mdmQueueConsumerLoader(
IChannelFactory theChannelFactory, IMdmSettings theMdmSettings, MdmMessageHandler theMdmMessageHandler) {
return new MdmQueueConsumerLoader(theChannelFactory, theMdmSettings, theMdmMessageHandler);
}
Expand Down Expand Up @@ -139,7 +139,7 @@ MessageHelper messageHelper(IMdmSettings theMdmSettings, FhirContext theFhirCont
}

@Bean
MdmSubscriptionLoader mdmSubscriptionLoader() {
public MdmSubscriptionLoader mdmSubscriptionLoader() {
return new MdmSubscriptionLoader();
}

Expand Down
10 changes: 7 additions & 3 deletions hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubscriptionLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,10 @@ synchronized void updateSubscriptionTopic(SubscriptionTopic theSubscriptionTopic
mySubscriptionTopicDao.update(theSubscriptionTopic, SystemRequestDetails.forAllPartitions());
}

protected ChannelProducerSettings getChannelProducerSettings() {
return new ChannelProducerSettings();
}

private org.hl7.fhir.dstu3.model.Subscription buildMdmSubscriptionDstu3(String theId, String theCriteria) {
org.hl7.fhir.dstu3.model.Subscription retval = new org.hl7.fhir.dstu3.model.Subscription();
retval.setId(theId);
Expand All @@ -147,7 +151,7 @@ private org.hl7.fhir.dstu3.model.Subscription buildMdmSubscriptionDstu3(String t
org.hl7.fhir.dstu3.model.Subscription.SubscriptionChannelComponent channel = retval.getChannel();
channel.setType(org.hl7.fhir.dstu3.model.Subscription.SubscriptionChannelType.MESSAGE);
channel.setEndpoint("channel:"
+ myChannelNamer.getChannelName(IMdmSettings.EMPI_CHANNEL_NAME, new ChannelProducerSettings()));
+ myChannelNamer.getChannelName(IMdmSettings.EMPI_CHANNEL_NAME, getChannelProducerSettings()));
channel.setPayload(Constants.CT_JSON);
return retval;
}
Expand All @@ -168,7 +172,7 @@ private Subscription buildMdmSubscriptionR4(String theId, String theCriteria) {
Subscription.SubscriptionChannelComponent channel = retval.getChannel();
channel.setType(Subscription.SubscriptionChannelType.MESSAGE);
channel.setEndpoint("channel:"
+ myChannelNamer.getChannelName(IMdmSettings.EMPI_CHANNEL_NAME, new ChannelProducerSettings()));
+ myChannelNamer.getChannelName(IMdmSettings.EMPI_CHANNEL_NAME, getChannelProducerSettings()));
channel.setPayload(Constants.CT_JSON);
return retval;
}
Expand Down Expand Up @@ -216,7 +220,7 @@ private List<IBaseResource> buildMdmSubscriptionR5(SubscriptionTopic theSubscrip
.setSystem(CanonicalSubscriptionChannelType.MESSAGE.getSystem()));

subscription.setEndpoint("channel:"
+ myChannelNamer.getChannelName(IMdmSettings.EMPI_CHANNEL_NAME, new ChannelProducerSettings()));
+ myChannelNamer.getChannelName(IMdmSettings.EMPI_CHANNEL_NAME, getChannelProducerSettings()));
subscription.setContentType(Constants.CT_JSON);

return Collections.singletonList(subscription);
Expand Down
6 changes: 5 additions & 1 deletion hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmChannelSubmitterSvcImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,12 @@ public MdmChannelSubmitterSvcImpl(FhirContext theFhirContext, IChannelFactory th
myChannelFactory = theIChannelFactory;
}

protected ChannelProducerSettings getChannelProducerSettings() {
return new ChannelProducerSettings();
}

private void init() {
ChannelProducerSettings channelSettings = new ChannelProducerSettings();
ChannelProducerSettings channelSettings = getChannelProducerSettings();
myMdmChannelProducer = myChannelFactory.getOrCreateProducer(
EMPI_CHANNEL_NAME, ResourceModifiedJsonMessage.class, channelSettings);
}
Expand Down
Loading