diff --git a/api/src/main/java/org/openmrs/module/pacsintegration/PacsIntegrationActivator.java b/api/src/main/java/org/openmrs/module/pacsintegration/PacsIntegrationActivator.java index f418c47..4f8b714 100644 --- a/api/src/main/java/org/openmrs/module/pacsintegration/PacsIntegrationActivator.java +++ b/api/src/main/java/org/openmrs/module/pacsintegration/PacsIntegrationActivator.java @@ -20,7 +20,7 @@ import org.openmrs.module.DaemonToken; import org.openmrs.module.DaemonTokenAware; import org.openmrs.module.ModuleActivator; -import org.openmrs.module.pacsintegration.api.PacsIntegrationService; +import org.openmrs.module.pacsintegration.incoming.IncomingMessageListener; import org.openmrs.module.pacsintegration.runner.DaemonTaskRunner; /** @@ -49,7 +49,7 @@ public void started() { */ public void willStop() { log.info("Stopping PACS Integration Module"); - Context.getService(PacsIntegrationService.class).stopHL7Listener(); + Context.getRegisteredComponent("hl7listener", IncomingMessageListener.class).stop(); } /** diff --git a/api/src/main/java/org/openmrs/module/pacsintegration/api/PacsIntegrationService.java b/api/src/main/java/org/openmrs/module/pacsintegration/api/PacsIntegrationService.java index b08b29a..3e74b41 100644 --- a/api/src/main/java/org/openmrs/module/pacsintegration/api/PacsIntegrationService.java +++ b/api/src/main/java/org/openmrs/module/pacsintegration/api/PacsIntegrationService.java @@ -33,21 +33,7 @@ public interface PacsIntegrationService extends OpenmrsService { /** * Adds a message to the outgoing queue for PACS */ - public void sendMessageToPacs(String message); + void sendMessageToPacs(String message); - /** - * Initializes the HL7 listener - */ - public void initializeHL7Listener(); - - /** - * @return true if the hl7 listener is running - */ - public boolean isHL7ListenerRunning(); - - /** - * Stops the HL7 listener - */ - public void stopHL7Listener(); } diff --git a/api/src/main/java/org/openmrs/module/pacsintegration/api/db/PacsIntegrationDAO.java b/api/src/main/java/org/openmrs/module/pacsintegration/api/db/PacsIntegrationDAO.java index d2ac80f..f961d43 100644 --- a/api/src/main/java/org/openmrs/module/pacsintegration/api/db/PacsIntegrationDAO.java +++ b/api/src/main/java/org/openmrs/module/pacsintegration/api/db/PacsIntegrationDAO.java @@ -20,6 +20,6 @@ */ public interface PacsIntegrationDAO { - public void saveOutboundQueue(OutboundQueue outboundQueue); + void saveOutboundQueue(OutboundQueue outboundQueue); } diff --git a/api/src/main/java/org/openmrs/module/pacsintegration/api/db/hibernate/HibernatePacsIntegrationDAO.java b/api/src/main/java/org/openmrs/module/pacsintegration/api/db/hibernate/HibernatePacsIntegrationDAO.java index 30f95cc..2fb4af4 100644 --- a/api/src/main/java/org/openmrs/module/pacsintegration/api/db/hibernate/HibernatePacsIntegrationDAO.java +++ b/api/src/main/java/org/openmrs/module/pacsintegration/api/db/hibernate/HibernatePacsIntegrationDAO.java @@ -13,8 +13,7 @@ */ package org.openmrs.module.pacsintegration.api.db.hibernate; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import lombok.Setter; import org.openmrs.api.db.hibernate.DbSessionFactory; import org.openmrs.module.pacsintegration.OutboundQueue; import org.openmrs.module.pacsintegration.api.db.PacsIntegrationDAO; @@ -24,24 +23,9 @@ * {@link org.openmrs.module.pacsintegration.api.db.PacsIntegrationDAO}. */ public class HibernatePacsIntegrationDAO implements PacsIntegrationDAO { - - protected final Log log = LogFactory.getLog(this.getClass()); - + + @Setter private DbSessionFactory sessionFactory; - - /** - * @param sessionFactory the sessionFactory to set - */ - public void setSessionFactory(DbSessionFactory sessionFactory) { - this.sessionFactory = sessionFactory; - } - - /** - * @return the sessionFactory - */ - public DbSessionFactory getSessionFactory() { - return sessionFactory; - } @Override public void saveOutboundQueue(OutboundQueue outboundQueue) { diff --git a/api/src/main/java/org/openmrs/module/pacsintegration/api/impl/PacsIntegrationServiceImpl.java b/api/src/main/java/org/openmrs/module/pacsintegration/api/impl/PacsIntegrationServiceImpl.java index ead53a5..0bff252 100644 --- a/api/src/main/java/org/openmrs/module/pacsintegration/api/impl/PacsIntegrationServiceImpl.java +++ b/api/src/main/java/org/openmrs/module/pacsintegration/api/impl/PacsIntegrationServiceImpl.java @@ -13,13 +13,11 @@ */ package org.openmrs.module.pacsintegration.api.impl; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import lombok.Setter; import org.openmrs.api.impl.BaseOpenmrsService; import org.openmrs.module.pacsintegration.OutboundQueue; import org.openmrs.module.pacsintegration.api.PacsIntegrationService; import org.openmrs.module.pacsintegration.api.db.PacsIntegrationDAO; -import org.openmrs.module.pacsintegration.incoming.IncomingMessageListener; import org.springframework.transaction.annotation.Transactional; /** @@ -27,12 +25,9 @@ * {@link org.openmrs.module.pacsintegration.api.PacsIntegrationService}. */ public class PacsIntegrationServiceImpl extends BaseOpenmrsService implements PacsIntegrationService { - - protected final Log log = LogFactory.getLog(this.getClass()); + @Setter private PacsIntegrationDAO dao; - - private IncomingMessageListener hl7Listener; @Override @Transactional @@ -40,43 +35,6 @@ public void sendMessageToPacs(String message) { OutboundQueue outbound = new OutboundQueue(message); dao.saveOutboundQueue(outbound); } - - @Override - public void initializeHL7Listener() { - hl7Listener.initialize(); - } - - @Override - public boolean isHL7ListenerRunning() { - return hl7Listener.isRunning(); - } - - @Override - public void stopHL7Listener() { - hl7Listener.stop(); - } - - /** - * @param dao the dao to set - */ - public void setDao(PacsIntegrationDAO dao) { - this.dao = dao; - } - - /** - * @return the dao - */ - public PacsIntegrationDAO getDao() { - return dao; - } - - public IncomingMessageListener getHl7Listener() { - return hl7Listener; - } - - public void setHl7Listener(IncomingMessageListener hl7Listener) { - this.hl7Listener = hl7Listener; - } } diff --git a/api/src/main/java/org/openmrs/module/pacsintegration/incoming/IncomingMessageHandler.java b/api/src/main/java/org/openmrs/module/pacsintegration/incoming/IncomingMessageHandler.java index 0a1f9cf..ea686bc 100644 --- a/api/src/main/java/org/openmrs/module/pacsintegration/incoming/IncomingMessageHandler.java +++ b/api/src/main/java/org/openmrs/module/pacsintegration/incoming/IncomingMessageHandler.java @@ -3,6 +3,7 @@ import ca.uhn.hl7v2.HL7Exception; import ca.uhn.hl7v2.app.Application; import ca.uhn.hl7v2.model.Message; +import lombok.Setter; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -24,6 +25,8 @@ import org.openmrs.module.pacsintegration.runner.TaskRunner; import org.openmrs.module.radiologyapp.RadiologyOrder; import org.openmrs.module.radiologyapp.RadiologyService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import java.util.Collections; import java.util.Date; @@ -33,24 +36,47 @@ abstract public class IncomingMessageHandler implements Application { protected final Log log = LogFactory.getLog(this.getClass()); + @Setter + @Autowired protected PatientService patientService; + @Setter + @Autowired protected ConceptService conceptService; + @Setter + @Autowired + @Qualifier("adminService") protected AdministrationService adminService; + @Setter + @Autowired protected RadiologyService radiologyService; + @Setter + @Autowired protected LocationService locationService; + @Setter + @Autowired protected ProviderService providerService; + @Setter + @Autowired protected EmrApiProperties emrApiProperties; + @Setter + @Autowired protected PacsIntegrationProperties pacsIntegrationProperties; + @Setter + @Autowired protected TaskRunner taskRunner; + public abstract String getMessageType(); + + public abstract String getTriggerEvent(); + @Override public synchronized Message processMessage(Message message) throws HL7Exception { IncomingMessageTask task = getHL7Task(message); @@ -148,45 +174,4 @@ protected Date syncTimeWithCurrentServerTime(Date date) { } } } - - - /** - * Setters - */ - - public void setPatientService(PatientService patientService) { - this.patientService = patientService; - } - - public void setConceptService(ConceptService conceptService) { - this.conceptService = conceptService; - } - - public void setAdminService(AdministrationService adminService) { - this.adminService = adminService; - } - - public void setRadiologyService(RadiologyService radiologyService) { - this.radiologyService = radiologyService; - } - - public void setLocationService(LocationService locationService) { - this.locationService = locationService; - } - - public void setEmrApiProperties(EmrApiProperties emrApiProperties) { - this.emrApiProperties = emrApiProperties; - } - - public void setPacsIntegrationProperties(PacsIntegrationProperties pacsIntegrationProperties) { - this.pacsIntegrationProperties = pacsIntegrationProperties; - } - - public void setProviderService(ProviderService providerService) { - this.providerService = providerService; - } - - public void setTaskRunner(TaskRunner taskRunner) { - this.taskRunner = taskRunner; - } } diff --git a/api/src/main/java/org/openmrs/module/pacsintegration/incoming/IncomingMessageListener.java b/api/src/main/java/org/openmrs/module/pacsintegration/incoming/IncomingMessageListener.java index d7a9649..3b22969 100644 --- a/api/src/main/java/org/openmrs/module/pacsintegration/incoming/IncomingMessageListener.java +++ b/api/src/main/java/org/openmrs/module/pacsintegration/incoming/IncomingMessageListener.java @@ -16,24 +16,33 @@ import ca.uhn.hl7v2.app.HL7Service; import ca.uhn.hl7v2.app.SimpleServer; +import lombok.Getter; +import lombok.Setter; import org.openmrs.module.pacsintegration.PacsIntegrationProperties; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; -import java.util.Map; +import java.util.List; +@Component("hl7listener") public class IncomingMessageListener { private HL7Service hl7Service; + @Setter + @Autowired private PacsIntegrationProperties pacsIntegrationProperties; - private Map handlers; + @Setter @Getter + @Autowired + List handlers; public void initialize() { hl7Service = new SimpleServer(pacsIntegrationProperties.getHL7ListenerPort()); - for (Map.Entry entry : handlers.entrySet()) { - String messageType = entry.getKey().split("_")[0]; - String triggerEvent = entry.getKey().split("_").length > 1 ? entry.getKey().split("_") [1] : null; - hl7Service.registerApplication(messageType, triggerEvent, entry.getValue()); + if (handlers != null) { + for (IncomingMessageHandler handler : handlers) { + hl7Service.registerApplication(handler.getMessageType(), handler.getTriggerEvent(), handler); + } } hl7Service.start(); } @@ -47,20 +56,4 @@ public void stop() { hl7Service.stop(); } } - - public void setHl7Service(HL7Service hl7Service) { - this.hl7Service = hl7Service; - } - - public void setPacsIntegrationProperties(PacsIntegrationProperties pacsIntegrationProperties) { - this.pacsIntegrationProperties = pacsIntegrationProperties; - } - - public Map getHandlers() { - return handlers; - } - - public void setHandlers(Map handlers) { - this.handlers = handlers; - } } diff --git a/api/src/main/java/org/openmrs/module/pacsintegration/incoming/ORM_O01Handler.java b/api/src/main/java/org/openmrs/module/pacsintegration/incoming/ORM_O01Handler.java index c0b3395..b8d79ae 100644 --- a/api/src/main/java/org/openmrs/module/pacsintegration/incoming/ORM_O01Handler.java +++ b/api/src/main/java/org/openmrs/module/pacsintegration/incoming/ORM_O01Handler.java @@ -14,12 +14,24 @@ import org.openmrs.module.pacsintegration.PacsIntegrationException; import org.openmrs.module.pacsintegration.util.HL7Utils; import org.openmrs.module.radiologyapp.RadiologyStudy; +import org.springframework.stereotype.Component; import java.text.ParseException; import java.util.Date; +@Component("ormO01Handler") public class ORM_O01Handler extends IncomingMessageHandler { + @Override + public String getMessageType() { + return "ORM"; + } + + @Override + public String getTriggerEvent() { + return "O01"; + } + @Override IncomingMessageTask getHL7Task(final Message message) { return new IncomingMessageTask() { diff --git a/api/src/main/java/org/openmrs/module/pacsintegration/incoming/ORU_R01Handler.java b/api/src/main/java/org/openmrs/module/pacsintegration/incoming/ORU_R01Handler.java index 201993a..9cc49b6 100644 --- a/api/src/main/java/org/openmrs/module/pacsintegration/incoming/ORU_R01Handler.java +++ b/api/src/main/java/org/openmrs/module/pacsintegration/incoming/ORU_R01Handler.java @@ -11,11 +11,23 @@ import org.openmrs.module.pacsintegration.util.HL7Utils; import org.openmrs.module.radiologyapp.RadiologyReport; import org.openmrs.util.OpenmrsUtil; +import org.springframework.stereotype.Component; import java.util.List; +@Component("oruR01Handler") public class ORU_R01Handler extends IncomingMessageHandler { + @Override + public String getMessageType() { + return "ORU"; + } + + @Override + public String getTriggerEvent() { + return "R01"; + } + @Override IncomingMessageTask getHL7Task(final Message message) { return new IncomingMessageTask() { diff --git a/api/src/main/java/org/openmrs/module/pacsintegration/outgoing/OrderEventListener.java b/api/src/main/java/org/openmrs/module/pacsintegration/outgoing/OrderEventListener.java index 38f31fd..9b6e7a8 100644 --- a/api/src/main/java/org/openmrs/module/pacsintegration/outgoing/OrderEventListener.java +++ b/api/src/main/java/org/openmrs/module/pacsintegration/outgoing/OrderEventListener.java @@ -14,6 +14,7 @@ package org.openmrs.module.pacsintegration.outgoing; +import lombok.Setter; import org.openmrs.OpenmrsObject; import org.openmrs.Order; import org.openmrs.annotation.Handler; @@ -23,6 +24,8 @@ import org.openmrs.module.pacsintegration.api.PacsIntegrationService; import org.openmrs.module.pacsintegration.runner.TaskRunner; import org.openmrs.module.radiologyapp.RadiologyOrder; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; import javax.jms.MapMessage; import javax.jms.Message; @@ -30,20 +33,25 @@ import java.util.List; @Handler +@Component public class OrderEventListener implements SubscribableEventListener { + @Setter + @Autowired private OrderService orderService; + @Setter + @Autowired private PacsIntegrationService pacsIntegrationService; + @Setter + @Autowired private OrderToPacsConverter converter; + @Setter + @Autowired protected TaskRunner taskRunner; - public void setTaskRunner(TaskRunner taskRunner) { - this.taskRunner = taskRunner; - } - @Override public void onMessage(Message message) { taskRunner.run(new OutgoingMessageTask(message) { @@ -85,16 +93,4 @@ public List subscribeToActions() { return Arrays.asList(Event.Action.CREATED.name(), Event.Action.UPDATED.name(), Event.Action.VOIDED.name(), Event.Action.PURGED.name(), Event.Action.UNVOIDED.name()); } - - public void setConverter(OrderToPacsConverter converter) { - this.converter = converter; - } - - public void setOrderService(OrderService orderService) { - this.orderService = orderService; - } - - public void setPacsIntegrationService(PacsIntegrationService pacsIntegrationService) { - this.pacsIntegrationService = pacsIntegrationService; - } } diff --git a/api/src/main/java/org/openmrs/module/pacsintegration/outgoing/OrderToPacsConverter.java b/api/src/main/java/org/openmrs/module/pacsintegration/outgoing/OrderToPacsConverter.java index 253d798..ac96a23 100644 --- a/api/src/main/java/org/openmrs/module/pacsintegration/outgoing/OrderToPacsConverter.java +++ b/api/src/main/java/org/openmrs/module/pacsintegration/outgoing/OrderToPacsConverter.java @@ -22,6 +22,7 @@ import ca.uhn.hl7v2.model.v23.segment.PV1; import ca.uhn.hl7v2.parser.Parser; import ca.uhn.hl7v2.parser.PipeParser; +import lombok.Setter; import org.apache.commons.lang.StringUtils; import org.openmrs.ConceptMap; import org.openmrs.ConceptMapType; @@ -44,28 +45,47 @@ import org.openmrs.module.radiologyapp.RadiologyOrder; import org.openmrs.module.radiologyapp.RadiologyProperties; import org.openmrs.util.LocaleUtility; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Component; import java.util.Date; import java.util.List; import java.util.Locale; import java.util.Set; +@Component("orderToPacsConverter") public class OrderToPacsConverter { - private Parser parser = new PipeParser(); + private final Parser parser = new PipeParser(); + @Setter + @Autowired private PatientService patientService; + @Setter + @Autowired + @Qualifier("adminService") private AdministrationService adminService; + @Setter + @Autowired private ConceptService conceptService; + @Setter + @Autowired private LocationService locationService; + @Setter + @Autowired private EmrApiProperties emrApiProperties; + @Setter + @Autowired private RadiologyProperties radiologyProperties; + @Setter + @Autowired private PacsIntegrationProperties pacsIntegrationProperties; public String convertToPacsFormat(RadiologyOrder order, String orderControl) throws HL7Exception { @@ -235,32 +255,4 @@ private Locale getDefaultLocale() { private ConceptMapType getSameAsConceptMapType() { return conceptService.getConceptMapTypeByUuid(PacsIntegrationConstants.SAME_AS_CONCEPT_MAP_TYPE_UUID); } - - public void setPatientService(PatientService patientService) { - this.patientService = patientService; - } - - public void setAdminService(AdministrationService adminService) { - this.adminService = adminService; - } - - public void setConceptService(ConceptService conceptService) { - this.conceptService = conceptService; - } - - public void setLocationService(LocationService locationService) { - this.locationService = locationService; - } - - public void setRadiologyProperties(RadiologyProperties radiologyProperties) { - this.radiologyProperties = radiologyProperties; - } - - public void setEmrApiProperties(EmrApiProperties emrApiProperties) { - this.emrApiProperties = emrApiProperties; - } - - public void setPacsIntegrationProperties(PacsIntegrationProperties pacsIntegrationProperties) { - this.pacsIntegrationProperties = pacsIntegrationProperties; - } } diff --git a/api/src/main/java/org/openmrs/module/pacsintegration/runner/DaemonTaskRunner.java b/api/src/main/java/org/openmrs/module/pacsintegration/runner/DaemonTaskRunner.java index 351ffb4..4f3804b 100644 --- a/api/src/main/java/org/openmrs/module/pacsintegration/runner/DaemonTaskRunner.java +++ b/api/src/main/java/org/openmrs/module/pacsintegration/runner/DaemonTaskRunner.java @@ -2,7 +2,9 @@ import org.openmrs.api.context.Daemon; import org.openmrs.module.DaemonToken; +import org.springframework.stereotype.Component; +@Component("pacsTaskRunner") public class DaemonTaskRunner implements TaskRunner { private static DaemonToken daemonToken; diff --git a/api/src/main/resources/moduleApplicationContext.xml b/api/src/main/resources/moduleApplicationContext.xml index 8032b32..43ca602 100644 --- a/api/src/main/resources/moduleApplicationContext.xml +++ b/api/src/main/resources/moduleApplicationContext.xml @@ -4,127 +4,6 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -134,17 +13,13 @@ - - - ${project.parent.groupId}.${project.parent.artifactId}.api.PacsIntegrationService - + diff --git a/api/src/test/java/org/openmrs/module/pacsintegration/incoming/IncomingMessageListenerTest.java b/api/src/test/java/org/openmrs/module/pacsintegration/incoming/IncomingMessageListenerTest.java index cb388ba..173468d 100644 --- a/api/src/test/java/org/openmrs/module/pacsintegration/incoming/IncomingMessageListenerTest.java +++ b/api/src/test/java/org/openmrs/module/pacsintegration/incoming/IncomingMessageListenerTest.java @@ -14,13 +14,11 @@ package org.openmrs.module.pacsintegration.incoming; -import ca.uhn.hl7v2.app.Application; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.openmrs.api.context.Context; -import org.openmrs.module.pacsintegration.api.PacsIntegrationService; import org.openmrs.module.pacsintegration.runner.TaskRunner; import org.openmrs.test.jupiter.BaseModuleContextSensitiveTest; import org.springframework.beans.factory.annotation.Autowired; @@ -88,7 +86,7 @@ public void setup() throws Exception { Context.clearSession(); if (!hl7Listener.isRunning()) { - Context.getService(PacsIntegrationService.class).initializeHL7Listener(); + hl7Listener.initialize(); } Thread.sleep(2000); @@ -109,22 +107,8 @@ public void shouldStartAndStopHl7Service() throws Exception { @Test public void shouldHaveHandlersForKnownMessages() { Assertions.assertEquals(2, hl7Listener.getHandlers().size()); - Assertions.assertTrue(hl7Listener.getHandlers().containsKey("ORM_O01")); - Assertions.assertTrue(hl7Listener.getHandlers().containsKey("ORU_R01")); - } - - @Test - public void shouldHaveRegisteredORM_O01Hander() { - Application handler = hl7Listener.getHandlers().get("ORM_O01"); - Assertions.assertNotNull(handler); - Assertions.assertEquals(handler.getClass(), ORM_O01Handler.class); - } - - @Test - public void shouldHaveRegisteredORU_R01Handler() { - Application handler = hl7Listener.getHandlers().get("ORU_R01"); - Assertions.assertNotNull(handler); - Assertions.assertEquals(handler.getClass(), ORU_R01Handler.class); + Assertions.assertTrue(hl7Listener.getHandlers().contains(orm_o01Handler)); + Assertions.assertTrue(hl7Listener.getHandlers().contains(oru_r01Handler)); } /** diff --git a/api/src/test/java/org/openmrs/module/pacsintegration/incoming/ORM_O01ComponentTest.java b/api/src/test/java/org/openmrs/module/pacsintegration/incoming/ORM_O01ComponentTest.java index d594b50..20c8746 100644 --- a/api/src/test/java/org/openmrs/module/pacsintegration/incoming/ORM_O01ComponentTest.java +++ b/api/src/test/java/org/openmrs/module/pacsintegration/incoming/ORM_O01ComponentTest.java @@ -66,7 +66,7 @@ public void setup() throws Exception { this.getConnection().commit(); this.updateSearchIndex(); Context.clearSession(); - Context.getService(PacsIntegrationService.class).initializeHL7Listener(); + Context.getRegisteredComponent("hl7listener", IncomingMessageListener.class).initialize(); ormO01Handler.setTaskRunner(runnable -> runnable.run()); } diff --git a/api/src/test/java/org/openmrs/module/pacsintegration/incoming/ORU_R01ComponentTest.java b/api/src/test/java/org/openmrs/module/pacsintegration/incoming/ORU_R01ComponentTest.java index 9d90f95..c131fdb 100644 --- a/api/src/test/java/org/openmrs/module/pacsintegration/incoming/ORU_R01ComponentTest.java +++ b/api/src/test/java/org/openmrs/module/pacsintegration/incoming/ORU_R01ComponentTest.java @@ -24,7 +24,6 @@ import org.openmrs.api.PatientService; import org.openmrs.api.context.Context; import org.openmrs.module.emrapi.EmrApiProperties; -import org.openmrs.module.pacsintegration.api.PacsIntegrationService; import org.openmrs.module.radiologyapp.RadiologyProperties; import org.openmrs.parameter.EncounterSearchCriteriaBuilder; import org.openmrs.test.jupiter.BaseModuleContextSensitiveTest; @@ -66,7 +65,7 @@ public void setup() throws Exception { this.getConnection().commit(); this.updateSearchIndex(); Context.clearSession(); - Context.getService(PacsIntegrationService.class).initializeHL7Listener(); + Context.getRegisteredComponent("hl7listener", IncomingMessageListener.class).initialize(); oruR01Handler.setTaskRunner(runnable -> runnable.run()); } diff --git a/pom.xml b/pom.xml index 78b177a..0c92793 100644 --- a/pom.xml +++ b/pom.xml @@ -49,6 +49,7 @@ 1.3.0 2.18.0 1.7.0 + 1.18.38 UTF-8 @@ -245,6 +246,13 @@ + + org.projectlombok + lombok + ${lombokVersion} + provided + + ca.uhn.hapi