From 2b70d8912e90ba67c00990a7d7aeb82cf819a89b Mon Sep 17 00:00:00 2001 From: Shaun Francis Date: Mon, 14 Oct 2019 18:32:22 +0100 Subject: [PATCH] Use MDC logger interceptor --- .../catchup/observers/CatchupObserver.java | 26 +++++-------------- .../commands/RebuildCommandHandler.java | 13 +++------- .../AddRemoveTriggerCommandHandler.java | 21 +++++---------- .../commands/VerifyCatchupCommandHandler.java | 13 ++++------ .../observers/CatchupObserverTest.java | 17 ------------ .../commands/RebuildCommandHandlerTest.java | 10 ------- .../AddRemoveTriggerCommandHandlerTest.java | 12 --------- .../VerifyCatchupCommandHandlerTest.java | 11 -------- pom.xml | 2 +- 9 files changed, 24 insertions(+), 101 deletions(-) diff --git a/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupObserver.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupObserver.java index 4e6090ff5..39df56f7e 100644 --- a/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupObserver.java +++ b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupObserver.java @@ -4,45 +4,33 @@ import uk.gov.justice.services.eventstore.management.events.catchup.CatchupProcessingOfEventFailedEvent; import uk.gov.justice.services.eventstore.management.events.catchup.CatchupRequestedEvent; import uk.gov.justice.services.eventstore.management.events.catchup.CatchupStartedForSubscriptionEvent; -import uk.gov.justice.services.jmx.logging.MdcLogger; +import uk.gov.justice.services.jmx.logging.MdcLoggerInterceptor; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; import javax.inject.Inject; +import javax.interceptor.Interceptors; +@Interceptors(MdcLoggerInterceptor.class) @ApplicationScoped public class CatchupObserver { @Inject private CatchupLifecycle catchupLifecycle; - @Inject - private MdcLogger mdcLogger; - public void onCatchupRequested(@Observes final CatchupRequestedEvent catchupRequestedEvent) { - - mdcLogger - .mdcLoggerConsumer() - .accept(() -> catchupLifecycle.handleCatchupRequested(catchupRequestedEvent)); + catchupLifecycle.handleCatchupRequested(catchupRequestedEvent); } public void onCatchupStartedForSubscription(@Observes final CatchupStartedForSubscriptionEvent catchupStartedForSubscriptionEvent) { - - mdcLogger - .mdcLoggerConsumer() - .accept(() -> catchupLifecycle.handleCatchupStartedForSubscription(catchupStartedForSubscriptionEvent)); + catchupLifecycle.handleCatchupStartedForSubscription(catchupStartedForSubscriptionEvent); } public void onCatchupCompleteForSubscription(@Observes final CatchupCompletedForSubscriptionEvent catchupCompletedForSubscriptionEvent) { - - mdcLogger - .mdcLoggerConsumer() - .accept(() -> catchupLifecycle.handleCatchupCompleteForSubscription(catchupCompletedForSubscriptionEvent)); + catchupLifecycle.handleCatchupCompleteForSubscription(catchupCompletedForSubscriptionEvent); } public void onCatchupProcessingOfEventFailed(@Observes final CatchupProcessingOfEventFailedEvent catchupProcessingOfEventFailedEvent) { - mdcLogger - .mdcLoggerConsumer() - .accept(() -> catchupLifecycle.handleCatchupProcessingOfEventFailed(catchupProcessingOfEventFailedEvent)); + catchupLifecycle.handleCatchupProcessingOfEventFailed(catchupProcessingOfEventFailedEvent); } } diff --git a/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/rebuild/commands/RebuildCommandHandler.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/rebuild/commands/RebuildCommandHandler.java index 852a1d8d9..b4456c50b 100644 --- a/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/rebuild/commands/RebuildCommandHandler.java +++ b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/rebuild/commands/RebuildCommandHandler.java @@ -5,26 +5,21 @@ import uk.gov.justice.services.eventstore.management.rebuild.process.RebuildProcessRunner; import uk.gov.justice.services.jmx.api.command.RebuildCommand; import uk.gov.justice.services.jmx.command.HandlesSystemCommand; -import uk.gov.justice.services.jmx.logging.MdcLogger; +import uk.gov.justice.services.jmx.logging.MdcLoggerInterceptor; import java.util.UUID; import javax.inject.Inject; +import javax.interceptor.Interceptors; public class RebuildCommandHandler { @Inject private RebuildProcessRunner rebuildProcessRunner; - @Inject - private MdcLogger mdcLogger; - - + @Interceptors(MdcLoggerInterceptor.class) @HandlesSystemCommand(REBUILD) public void doRebuild(final RebuildCommand rebuildCommand, final UUID commandId) { - - mdcLogger.mdcLoggerConsumer().accept(() -> { - rebuildProcessRunner.runRebuild(commandId, rebuildCommand); - }); + rebuildProcessRunner.runRebuild(commandId, rebuildCommand); } } diff --git a/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/untrigger/commands/AddRemoveTriggerCommandHandler.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/untrigger/commands/AddRemoveTriggerCommandHandler.java index 4294f1390..50bf44d83 100644 --- a/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/untrigger/commands/AddRemoveTriggerCommandHandler.java +++ b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/untrigger/commands/AddRemoveTriggerCommandHandler.java @@ -8,44 +8,37 @@ import uk.gov.justice.services.jmx.api.command.AddTriggerCommand; import uk.gov.justice.services.jmx.api.command.RemoveTriggerCommand; import uk.gov.justice.services.jmx.command.HandlesSystemCommand; -import uk.gov.justice.services.jmx.logging.MdcLogger; +import uk.gov.justice.services.jmx.logging.MdcLoggerInterceptor; import java.util.UUID; import javax.inject.Inject; +import javax.interceptor.Interceptors; import org.slf4j.Logger; +@Interceptors(MdcLoggerInterceptor.class) public class AddRemoveTriggerCommandHandler { @Inject private AddRemoveTriggerProcessRunner addRemoveTriggerProcessRunner; - @Inject - private MdcLogger mdcLogger; - @Inject private Logger logger; @HandlesSystemCommand(ADD_TRIGGER) public void addTriggerToEventLogTable(final AddTriggerCommand addTriggerCommand, final UUID commandId) { - mdcLogger.mdcLoggerConsumer().accept(() -> { + logger.info(format("Received command %s", addTriggerCommand.getName())); - logger.info(format("Received command %s", addTriggerCommand.getName())); - - addRemoveTriggerProcessRunner.addTriggerToEventLogTable(commandId, addTriggerCommand); - }); + addRemoveTriggerProcessRunner.addTriggerToEventLogTable(commandId, addTriggerCommand); } @HandlesSystemCommand(REMOVE_TRIGGER) public void removeTriggerFromEventLogTable(final RemoveTriggerCommand removeTriggerCommand, final UUID commandId) { - mdcLogger.mdcLoggerConsumer().accept(() -> { - - logger.info(format("Received command %s", removeTriggerCommand.getName())); + logger.info(format("Received command %s", removeTriggerCommand.getName())); - addRemoveTriggerProcessRunner.removeTriggerFromEventLogTable(commandId, removeTriggerCommand); - }); + addRemoveTriggerProcessRunner.removeTriggerFromEventLogTable(commandId, removeTriggerCommand); } } diff --git a/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/commands/VerifyCatchupCommandHandler.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/commands/VerifyCatchupCommandHandler.java index ac57163de..a28815526 100644 --- a/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/commands/VerifyCatchupCommandHandler.java +++ b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/commands/VerifyCatchupCommandHandler.java @@ -6,11 +6,12 @@ import uk.gov.justice.services.eventstore.management.validation.process.CatchupVerificationProcessRunner; import uk.gov.justice.services.jmx.api.command.VerifyCatchupCommand; import uk.gov.justice.services.jmx.command.HandlesSystemCommand; -import uk.gov.justice.services.jmx.logging.MdcLogger; +import uk.gov.justice.services.jmx.logging.MdcLoggerInterceptor; import java.util.UUID; import javax.inject.Inject; +import javax.interceptor.Interceptors; import org.slf4j.Logger; @@ -19,18 +20,14 @@ public class VerifyCatchupCommandHandler { @Inject private CatchupVerificationProcessRunner catchupVerificationProcessRunner; - @Inject - private MdcLogger mdcLogger; - @Inject private Logger logger; + @Interceptors(MdcLoggerInterceptor.class) @HandlesSystemCommand(VERIFY_CATCHUP) public void validateCatchup(final VerifyCatchupCommand verifyCatchupCommand, final UUID commandId) { - mdcLogger.mdcLoggerConsumer().accept(() -> { - logger.info(format("Received %s command", verifyCatchupCommand.getName())); - catchupVerificationProcessRunner.runVerificationProcess(commandId, verifyCatchupCommand); - }); + logger.info(format("Received %s command", verifyCatchupCommand.getName())); + catchupVerificationProcessRunner.runVerificationProcess(commandId, verifyCatchupCommand); } } diff --git a/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupObserverTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupObserverTest.java index 49235e91a..38cac9081 100644 --- a/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupObserverTest.java +++ b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupObserverTest.java @@ -2,15 +2,11 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; import uk.gov.justice.services.eventstore.management.events.catchup.CatchupCompletedForSubscriptionEvent; import uk.gov.justice.services.eventstore.management.events.catchup.CatchupProcessingOfEventFailedEvent; import uk.gov.justice.services.eventstore.management.events.catchup.CatchupRequestedEvent; import uk.gov.justice.services.eventstore.management.events.catchup.CatchupStartedForSubscriptionEvent; -import uk.gov.justice.services.jmx.logging.MdcLogger; - -import java.util.function.Consumer; import org.junit.Test; import org.junit.runner.RunWith; @@ -24,21 +20,14 @@ public class CatchupObserverTest { @Mock private CatchupLifecycle catchupLifecycle; - @Mock - private MdcLogger mdcLogger; - @InjectMocks private CatchupObserver catchupObserver; - private Consumer testConsumer = Runnable::run; - @Test public void shouldHandleCatchupRequested() throws Exception { final CatchupRequestedEvent catchupRequestedEvent = mock(CatchupRequestedEvent.class); - when(mdcLogger.mdcLoggerConsumer()).thenReturn(testConsumer); - catchupObserver.onCatchupRequested(catchupRequestedEvent); verify(catchupLifecycle).handleCatchupRequested(catchupRequestedEvent); @@ -49,8 +38,6 @@ public void shouldHandleCatchupStartedForSubscription() throws Exception { final CatchupStartedForSubscriptionEvent catchupStartedForSubscriptionEvent = mock(CatchupStartedForSubscriptionEvent.class); - when(mdcLogger.mdcLoggerConsumer()).thenReturn(testConsumer); - catchupObserver.onCatchupStartedForSubscription(catchupStartedForSubscriptionEvent); verify(catchupLifecycle).handleCatchupStartedForSubscription(catchupStartedForSubscriptionEvent); @@ -61,8 +48,6 @@ public void shouldHandleCatchupCompleteForSubscription() throws Exception { final CatchupCompletedForSubscriptionEvent catchupCompletedForSubscriptionEvent = mock(CatchupCompletedForSubscriptionEvent.class); - when(mdcLogger.mdcLoggerConsumer()).thenReturn(testConsumer); - catchupObserver.onCatchupCompleteForSubscription(catchupCompletedForSubscriptionEvent); verify(catchupLifecycle).handleCatchupCompleteForSubscription(catchupCompletedForSubscriptionEvent); @@ -73,8 +58,6 @@ public void shouldHandleCatchupProcessingOfEventFailed() throws Exception { final CatchupProcessingOfEventFailedEvent catchupProcessingOfEventFailedEvent = mock(CatchupProcessingOfEventFailedEvent.class); - when(mdcLogger.mdcLoggerConsumer()).thenReturn(testConsumer); - catchupObserver.onCatchupProcessingOfEventFailed(catchupProcessingOfEventFailedEvent); verify(catchupLifecycle).handleCatchupProcessingOfEventFailed(catchupProcessingOfEventFailedEvent); diff --git a/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/rebuild/commands/RebuildCommandHandlerTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/rebuild/commands/RebuildCommandHandlerTest.java index 90ea16022..2c3cfb191 100644 --- a/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/rebuild/commands/RebuildCommandHandlerTest.java +++ b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/rebuild/commands/RebuildCommandHandlerTest.java @@ -2,14 +2,11 @@ import static java.util.UUID.randomUUID; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; import uk.gov.justice.services.eventstore.management.rebuild.process.RebuildProcessRunner; import uk.gov.justice.services.jmx.api.command.RebuildCommand; -import uk.gov.justice.services.jmx.logging.MdcLogger; import java.util.UUID; -import java.util.function.Consumer; import org.junit.Test; import org.junit.runner.RunWith; @@ -23,22 +20,15 @@ public class RebuildCommandHandlerTest { @Mock private RebuildProcessRunner rebuildProcessRunner; - @Mock - private MdcLogger mdcLogger; - @InjectMocks private RebuildCommandHandler rebuildCommandHandler; - private Consumer testConsumer = Runnable::run; - @Test public void shouldFireRebuildEvent() throws Exception { final UUID commandId = randomUUID(); final RebuildCommand rebuildCommand = new RebuildCommand(); - when(mdcLogger.mdcLoggerConsumer()).thenReturn(testConsumer); - rebuildCommandHandler.doRebuild(rebuildCommand, commandId); verify(rebuildProcessRunner).runRebuild(commandId, rebuildCommand); diff --git a/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/untrigger/commands/AddRemoveTriggerCommandHandlerTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/untrigger/commands/AddRemoveTriggerCommandHandlerTest.java index 4f665ec7b..3b338cfca 100644 --- a/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/untrigger/commands/AddRemoveTriggerCommandHandlerTest.java +++ b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/untrigger/commands/AddRemoveTriggerCommandHandlerTest.java @@ -2,15 +2,12 @@ import static java.util.UUID.randomUUID; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; import uk.gov.justice.services.eventstore.management.untrigger.process.AddRemoveTriggerProcessRunner; import uk.gov.justice.services.jmx.api.command.AddTriggerCommand; import uk.gov.justice.services.jmx.api.command.RemoveTriggerCommand; -import uk.gov.justice.services.jmx.logging.MdcLogger; import java.util.UUID; -import java.util.function.Consumer; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,25 +22,18 @@ public class AddRemoveTriggerCommandHandlerTest { @Mock private AddRemoveTriggerProcessRunner addRemoveTriggerProcessRunner; - @Mock - private MdcLogger mdcLogger; - @Mock private Logger logger; @InjectMocks private AddRemoveTriggerCommandHandler addRemoveTriggerCommandHandler; - private Consumer testConsumer = Runnable::run; - @Test public void shouldCallTheAddEventLogTriggerProcess() throws Exception { final UUID commandId = randomUUID(); final AddTriggerCommand addTriggerCommand = new AddTriggerCommand(); - when(mdcLogger.mdcLoggerConsumer()).thenReturn(testConsumer); - addRemoveTriggerCommandHandler.addTriggerToEventLogTable(addTriggerCommand, commandId); verify(logger).info("Received command ADD_TRIGGER"); @@ -56,8 +46,6 @@ public void shouldCallTheRemoveEventLogTriggerProcess() throws Exception { final UUID commandId = randomUUID(); final RemoveTriggerCommand removeTriggerCommand = new RemoveTriggerCommand(); - when(mdcLogger.mdcLoggerConsumer()).thenReturn(testConsumer); - addRemoveTriggerCommandHandler.removeTriggerFromEventLogTable(removeTriggerCommand, commandId); verify(logger).info("Received command REMOVE_TRIGGER"); diff --git a/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/commands/VerifyCatchupCommandHandlerTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/commands/VerifyCatchupCommandHandlerTest.java index 865ec18f3..d99f1dc2b 100644 --- a/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/commands/VerifyCatchupCommandHandlerTest.java +++ b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/commands/VerifyCatchupCommandHandlerTest.java @@ -1,15 +1,11 @@ package uk.gov.justice.services.eventstore.management.validation.commands; import static org.mockito.Mockito.inOrder; -import static org.mockito.Mockito.when; -import uk.gov.justice.services.eventstore.management.validation.process.CatchupVerificationProcess; import uk.gov.justice.services.eventstore.management.validation.process.CatchupVerificationProcessRunner; import uk.gov.justice.services.jmx.api.command.VerifyCatchupCommand; -import uk.gov.justice.services.jmx.logging.MdcLogger; import java.util.UUID; -import java.util.function.Consumer; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,14 +21,9 @@ public class VerifyCatchupCommandHandlerTest { @Mock private CatchupVerificationProcessRunner catchupVerificationProcessRunner; - @Mock - private MdcLogger mdcLogger; - @Mock private Logger logger; - private Consumer testConsumer = Runnable::run; - @InjectMocks private VerifyCatchupCommandHandler verifyCatchupCommandHandler; @@ -42,8 +33,6 @@ public void shouldRunTheVerificationProcess() throws Exception { final UUID commandId = UUID.randomUUID(); final VerifyCatchupCommand verifyCatchupCommand = new VerifyCatchupCommand(); - when(mdcLogger.mdcLoggerConsumer()).thenReturn(testConsumer); - verifyCatchupCommandHandler.validateCatchup(verifyCatchupCommand, commandId); final InOrder inOrder = inOrder(logger, catchupVerificationProcessRunner); diff --git a/pom.xml b/pom.xml index 415dbc8c2..a2e3f1cfe 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ event-store 4.1.0 - 6.2.0-M5 + 6.2.0-M6 2.4.0 1.20.1 1.24.3