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

Rename class, add log

This commit is contained in:
Tadgh 2020-08-06 11:02:20 -07:00
parent ed618613a6
commit d6ad434339
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ import ca.uhn.fhir.interceptor.api.HookParams;
import ca.uhn.fhir.interceptor.api.IInterceptorBroadcaster;
import ca.uhn.fhir.interceptor.api.Pointcut;
import ca.uhn.fhir.jpa.empi.svc.EmpiMatchLinkSvc;
import ca.uhn.fhir.jpa.empi.svc.EmpiMessageFilteringSvc;
import ca.uhn.fhir.jpa.empi.svc.EmpiResourceFilteringSvc;
import ca.uhn.fhir.jpa.subscription.model.ResourceModifiedJsonMessage;
import ca.uhn.fhir.jpa.subscription.model.ResourceModifiedMessage;
import ca.uhn.fhir.rest.server.TransactionLogMessages;
@ -52,7 +52,7 @@ public class EmpiMessageHandler implements MessageHandler {
@Autowired
private FhirContext myFhirContext;
@Autowired
private EmpiMessageFilteringSvc myEmpiResourceFileringSvc;
private EmpiResourceFilteringSvc myEmpiResourceFileringSvc;
@Override
public void handleMessage(Message<?> theMessage) throws MessagingException {

6
hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/config/EmpiConsumerConfig.java
View File

@ -47,7 +47,7 @@ import ca.uhn.fhir.jpa.empi.svc.EmpiLinkSvcImpl;
import ca.uhn.fhir.jpa.empi.svc.EmpiLinkUpdaterSvcImpl;
import ca.uhn.fhir.jpa.empi.svc.EmpiMatchFinderSvcImpl;
import ca.uhn.fhir.jpa.empi.svc.EmpiMatchLinkSvc;
import ca.uhn.fhir.jpa.empi.svc.EmpiMessageFilteringSvc;
import ca.uhn.fhir.jpa.empi.svc.EmpiResourceFilteringSvc;
import ca.uhn.fhir.jpa.empi.svc.EmpiPersonDeletingSvc;
import ca.uhn.fhir.jpa.empi.svc.EmpiPersonMergerSvcImpl;
import ca.uhn.fhir.jpa.empi.svc.EmpiResetSvcImpl;
@ -214,7 +214,7 @@ public class EmpiConsumerConfig {
}
@Bean
EmpiMessageFilteringSvc empiMessageFilteringSvc() {
return new EmpiMessageFilteringSvc();
EmpiResourceFilteringSvc empiMessageFilteringSvc() {
return new EmpiResourceFilteringSvc();
}
}

3
hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiMessageFilteringSvc.java → hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiResourceFilteringSvc.java
View File

@ -15,7 +15,7 @@ import java.util.List;
*
*/
@Service
public class EmpiMessageFilteringSvc {
public class EmpiResourceFilteringSvc {
private static final Logger ourLog = Logs.getEmpiTroubleshootingLog();
@Autowired
@ -46,6 +46,7 @@ public class EmpiMessageFilteringSvc {
.map(searchParam -> myEmpiSearchParamSvc.getValueFromResourceForSearchParam(theResource, searchParam))
.anyMatch(valueList -> !valueList.isEmpty());
ourLog.debug("Is {} suitable for EMPI processing? : {}", theResource.getId(), containsValueForSomeSearchParam);
return containsValueForSomeSearchParam;
}

4
hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiMessageFilteringSvcTest.java → hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiResourceFilteringSvcTest.java
View File

@ -10,10 +10,10 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
class EmpiMessageFilteringSvcTest extends BaseEmpiR4Test {
class EmpiResourceFilteringSvcTest extends BaseEmpiR4Test {
@Autowired
private EmpiMessageFilteringSvc myEmpiMessageFilteringSvc;
private EmpiResourceFilteringSvc myEmpiMessageFilteringSvc;
@Test
public void testFilterResourcesWhichHaveNoRelevantAttributes() {