diff --git a/CHANGELOG.md b/CHANGELOG.md index 95a9460..e8895a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Changed -- Normalized logging using Keyple coding standards. +- Normalized logging and error messages using Keyple coding standards. ### Upgraded - `keyple-plugin-java-api` from `2.3.1` to `2.3.2` (code source not impacted) - `keyple-distributed-remote-java-api` from `3.1.0` to `3.1.1` (code source not impacted) diff --git a/src/main/java/org/eclipse/keyple/core/service/AbstractPluginAdapter.java b/src/main/java/org/eclipse/keyple/core/service/AbstractPluginAdapter.java index 9a7b4c7..9781dd7 100644 --- a/src/main/java/org/eclipse/keyple/core/service/AbstractPluginAdapter.java +++ b/src/main/java/org/eclipse/keyple/core/service/AbstractPluginAdapter.java @@ -110,7 +110,7 @@ void unregister() { ((AbstractReaderAdapter) reader).unregister(); } catch (Exception e) { logger.warn( - "[plugin={}] Failed to unregister reader [name={}, reason={}]", + "[plugin={}] Failed to unregister reader [reader={}, reason={}]", pluginName, reader.getName(), e.getMessage()); diff --git a/src/main/java/org/eclipse/keyple/core/service/ApduResponseAdapter.java b/src/main/java/org/eclipse/keyple/core/service/ApduResponseAdapter.java index ef840d3..69a8498 100644 --- a/src/main/java/org/eclipse/keyple/core/service/ApduResponseAdapter.java +++ b/src/main/java/org/eclipse/keyple/core/service/ApduResponseAdapter.java @@ -67,9 +67,8 @@ public int getStatusWord() { } /** - * Returns a string representation of the object. + * {@inheritDoc} * - * @return A string that represents the current state of the object. * @since 2.0.0 */ @Override diff --git a/src/main/java/org/eclipse/keyple/core/service/AutonomousObservableLocalPluginAdapter.java b/src/main/java/org/eclipse/keyple/core/service/AutonomousObservableLocalPluginAdapter.java index 6c390d4..035dc23 100644 --- a/src/main/java/org/eclipse/keyple/core/service/AutonomousObservableLocalPluginAdapter.java +++ b/src/main/java/org/eclipse/keyple/core/service/AutonomousObservableLocalPluginAdapter.java @@ -85,14 +85,17 @@ public void onReaderDisconnected(Set readerNames) { for (String readerName : readerNames) { CardReader reader = this.getReader(readerName); if (reader == null) { - logger.warn("[plugin={}] Unable to remove unknown reader [name={}]", getName(), readerName); + logger.warn( + "[plugin={}] Unable to remove unknown reader [reader={}]", getName(), readerName); } else { // unregister and remove reader ((LocalReaderAdapter) reader).unregister(); getReadersMap().remove(reader.getName()); - logger.info( - "[plugin={}] Reader removed from readers list [name={}]", getName(), reader.getName()); notifyReaders.add(readerName); + logger.info( + "[plugin={}] Reader removed from readers list [reader={}]", + getName(), + reader.getName()); } } @@ -110,6 +113,6 @@ private void addReader(ReaderSpi readerSpi) { reader.register(); getReadersMap().put(reader.getName(), reader); logger.info( - "[plugin={}] Reader added to readers list [name={}]", getName(), readerSpi.getName()); + "[plugin={}] Reader added to readers list [reader={}]", getName(), readerSpi.getName()); } } diff --git a/src/main/java/org/eclipse/keyple/core/service/BasicCardSelectorAdapter.java b/src/main/java/org/eclipse/keyple/core/service/BasicCardSelectorAdapter.java index bbad60b..9906eb5 100644 --- a/src/main/java/org/eclipse/keyple/core/service/BasicCardSelectorAdapter.java +++ b/src/main/java/org/eclipse/keyple/core/service/BasicCardSelectorAdapter.java @@ -65,9 +65,8 @@ public BasicCardSelector filterByPowerOnData(String powerOnDataRegex) { } /** - * Returns a string representation of the object. + * {@inheritDoc} * - * @return A string that represents the current state of the object. * @since 3.0.0 */ @Override diff --git a/src/main/java/org/eclipse/keyple/core/service/CardInsertionActiveMonitoringJobAdapter.java b/src/main/java/org/eclipse/keyple/core/service/CardInsertionActiveMonitoringJobAdapter.java index 6425b47..48578b5 100644 --- a/src/main/java/org/eclipse/keyple/core/service/CardInsertionActiveMonitoringJobAdapter.java +++ b/src/main/java/org/eclipse/keyple/core/service/CardInsertionActiveMonitoringJobAdapter.java @@ -78,7 +78,7 @@ public void run() { try { if (logger.isTraceEnabled()) { logger.trace( - "[fsmJob={}, reader={}] Starting monitoring job polling process using 'isCardPresent()'", + "[fsmJob={}, reader={}] Starting monitoring job process [mode=Polling using 'isCardPresent()']", JOB_ID, reader.getName()); } diff --git a/src/main/java/org/eclipse/keyple/core/service/CardRemovalActiveMonitoringJobAdapter.java b/src/main/java/org/eclipse/keyple/core/service/CardRemovalActiveMonitoringJobAdapter.java index 6dd809b..6939fa2 100644 --- a/src/main/java/org/eclipse/keyple/core/service/CardRemovalActiveMonitoringJobAdapter.java +++ b/src/main/java/org/eclipse/keyple/core/service/CardRemovalActiveMonitoringJobAdapter.java @@ -81,7 +81,7 @@ public void run() { try { if (logger.isTraceEnabled()) { logger.trace( - "[fsmJob={}, reader={}] Starting monitoring job polling process using 'isCardPresentPing()'", + "[fsmJob={}, reader={}] Starting monitoring job process [mode=Polling using 'isCardPresentPing()']", JOB_ID, getReader().getName()); } diff --git a/src/main/java/org/eclipse/keyple/core/service/CardResponseAdapter.java b/src/main/java/org/eclipse/keyple/core/service/CardResponseAdapter.java index c293498..f835613 100644 --- a/src/main/java/org/eclipse/keyple/core/service/CardResponseAdapter.java +++ b/src/main/java/org/eclipse/keyple/core/service/CardResponseAdapter.java @@ -63,9 +63,8 @@ public boolean isLogicalChannelOpen() { } /** - * Returns a string representation of the object. + * {@inheritDoc} * - * @return A string that represents the current state of the object. * @since 2.0.0 */ @Override diff --git a/src/main/java/org/eclipse/keyple/core/service/CardSelectionManagerAdapter.java b/src/main/java/org/eclipse/keyple/core/service/CardSelectionManagerAdapter.java index af4bc44..1c5b5f5 100644 --- a/src/main/java/org/eclipse/keyple/core/service/CardSelectionManagerAdapter.java +++ b/src/main/java/org/eclipse/keyple/core/service/CardSelectionManagerAdapter.java @@ -218,7 +218,7 @@ public int importCardSelectionScenario(String cardSelectionScenario) { } catch (ClassNotFoundException e) { // Default card selection logger.warn( - "Original CardSelection type '{}' is not found. Replaced by default type '{}' for deserialization", + "Original CardSelection type '{}' not found. Replaced by default type '{}' for deserialization", cardSelectionsTypes.get(i), CardSelectionAdapter.class.getName()); cardSelection = diff --git a/src/main/java/org/eclipse/keyple/core/service/CardSelectionResponseAdapter.java b/src/main/java/org/eclipse/keyple/core/service/CardSelectionResponseAdapter.java index dbc47a3..e9dc4cd 100644 --- a/src/main/java/org/eclipse/keyple/core/service/CardSelectionResponseAdapter.java +++ b/src/main/java/org/eclipse/keyple/core/service/CardSelectionResponseAdapter.java @@ -95,9 +95,8 @@ public CardResponseApi getCardResponse() { } /** - * Returns a string representation of the object. + * {@inheritDoc} * - * @return A string that represents the current state of the object. * @since 2.0.0 */ @Override diff --git a/src/main/java/org/eclipse/keyple/core/service/CardSelectionScenarioAdapter.java b/src/main/java/org/eclipse/keyple/core/service/CardSelectionScenarioAdapter.java index f8199c1..ba9c765 100644 --- a/src/main/java/org/eclipse/keyple/core/service/CardSelectionScenarioAdapter.java +++ b/src/main/java/org/eclipse/keyple/core/service/CardSelectionScenarioAdapter.java @@ -114,9 +114,8 @@ ChannelControl getChannelControl() { } /** - * Returns a string representation of the object. + * {@inheritDoc} * - * @return A string that represents the current state of the object. * @since 2.0.0 */ @Override diff --git a/src/main/java/org/eclipse/keyple/core/service/DistributedLocalServiceAdapter.java b/src/main/java/org/eclipse/keyple/core/service/DistributedLocalServiceAdapter.java index 088c960..656c54e 100644 --- a/src/main/java/org/eclipse/keyple/core/service/DistributedLocalServiceAdapter.java +++ b/src/main/java/org/eclipse/keyple/core/service/DistributedLocalServiceAdapter.java @@ -100,7 +100,7 @@ public String executeLocally(String jsonData, String readerName) { if (readerName != null) { if (logger.isDebugEnabled()) { logger.debug( - "[localService={}] Processing locally data on reader [name={}, jsonData={}]", + "[localService={}] Processing data on local reader [reader={}, jsonData={}]", name, readerName, jsonData); @@ -109,7 +109,7 @@ public String executeLocally(String jsonData, String readerName) { } else { if (logger.isDebugEnabled()) { logger.debug( - "[localService={}] Processing locally data on plugins [jsonData={}]", name, jsonData); + "[localService={}] Processing data on local plugins [jsonData={}]", name, jsonData); } return new LocalPluginExecutor(jsonData).execute(); } @@ -192,12 +192,12 @@ public void onReaderEvent(CardReaderEvent readerEvent) { */ void register() { int distributedApiLevel = localServiceSpi.exchangeApiLevel(CORE_API_LEVEL); + isRegistered = true; logger.info( - "[localService={}] Registering distributed local service [coreApiLevel={}, localServiceApiLevel={}]", + "[localService={}] Distributed local service registered [coreApiLevel={}, localServiceApiLevel={}]", name, CORE_API_LEVEL, distributedApiLevel); - isRegistered = true; } /** diff --git a/src/main/java/org/eclipse/keyple/core/service/IsoCardSelectorAdapter.java b/src/main/java/org/eclipse/keyple/core/service/IsoCardSelectorAdapter.java index 0ba35a8..5fd002e 100644 --- a/src/main/java/org/eclipse/keyple/core/service/IsoCardSelectorAdapter.java +++ b/src/main/java/org/eclipse/keyple/core/service/IsoCardSelectorAdapter.java @@ -144,9 +144,8 @@ public IsoCardSelector filterByPowerOnData(String powerOnDataRegex) { } /** - * Returns a string representation of the object. + * {@inheritDoc} * - * @return A string that represents the current state of the object. * @since 3.0.0 */ @Override diff --git a/src/main/java/org/eclipse/keyple/core/service/LocalPoolPluginAdapter.java b/src/main/java/org/eclipse/keyple/core/service/LocalPoolPluginAdapter.java index b1d758c..9df954c 100644 --- a/src/main/java/org/eclipse/keyple/core/service/LocalPoolPluginAdapter.java +++ b/src/main/java/org/eclipse/keyple/core/service/LocalPoolPluginAdapter.java @@ -59,7 +59,9 @@ void unregister() { poolPluginSpi.onUnregister(); } catch (Exception e) { logger.warn( - "Failed to unregister plugin extension [name={}, reason={}]", getName(), e.getMessage()); + "[plugin={}] Failed to unregister plugin extension [reason={}]", + getName(), + e.getMessage()); } super.unregister(); } @@ -112,6 +114,10 @@ public CardReader allocateReader(String readerGroupReference) { LocalReaderAdapter localReaderAdapter = buildLocalReaderAdapter(readerSpi); getReadersMap().put(localReaderAdapter.getName(), localReaderAdapter); localReaderAdapter.register(); + + if (logger.isDebugEnabled()) { + logger.debug("[plugin={}] Reader allocated", getName()); + } return localReaderAdapter; } @@ -139,7 +145,7 @@ public void releaseReader(CardReader reader) { checkStatus(); if (logger.isDebugEnabled()) { logger.debug( - "[plugin={}] Releasing reader [name={}]", + "[plugin={}] Releasing reader [reader={}]", getName(), reader != null ? reader.getName() : null); } @@ -155,5 +161,9 @@ public void releaseReader(CardReader reader) { getReadersMap().remove(reader.getName()); ((LocalReaderAdapter) reader).unregister(); } + + if (logger.isDebugEnabled()) { + logger.debug("[plugin={}] Reader released", getName()); + } } } diff --git a/src/main/java/org/eclipse/keyple/core/service/ObservableLocalPluginAdapter.java b/src/main/java/org/eclipse/keyple/core/service/ObservableLocalPluginAdapter.java index 9fda6ef..c14715d 100644 --- a/src/main/java/org/eclipse/keyple/core/service/ObservableLocalPluginAdapter.java +++ b/src/main/java/org/eclipse/keyple/core/service/ObservableLocalPluginAdapter.java @@ -64,7 +64,7 @@ boolean isMonitoring() { public void addObserver(PluginObserverSpi observer) { super.addObserver(observer); if (countObservers() == 1) { - logger.info("[plugin={}] Starting plugin monitoring", getName()); + logger.info("[plugin={}] Starting reader monitoring", getName()); thread = new EventThread(getName()); thread.setName("PluginEventMonitoringThread"); thread.setUncaughtExceptionHandler( @@ -92,7 +92,7 @@ public void removeObserver(PluginObserverSpi observer) { if (countObservers() == 0) { if (thread != null) { thread.end(); - logger.info("[plugin={}] Plugin monitoring stopped", getName()); + logger.info("[plugin={}] Reader monitoring stopped", getName()); } } } @@ -108,7 +108,7 @@ public void clearObservers() { super.clearObservers(); if (thread != null) { thread.end(); - logger.info("[plugin={}] Plugin monitoring stopped", getName()); + logger.info("[plugin={}] Reader monitoring stopped", getName()); } } @@ -149,7 +149,7 @@ private void addReader(String readerName) throws PluginIOException { reader.register(); getReadersMap().put(reader.getName(), reader); logger.info( - "[plugin={}] Adding new plugged reader to readers list [name={}]", + "[plugin={}] New plugged reader added to readers list [reader={}]", pluginName, readerName); } @@ -159,7 +159,7 @@ private void removeReader(CardReader reader) { ((LocalReaderAdapter) reader).unregister(); getReadersMap().remove(reader.getName()); logger.info( - "[plugin={}] Removing unplugged reader from readers list [name={}]", + "[plugin={}] Unplugged reader removed from readers list [reader={}]", pluginName, reader.getName()); } @@ -241,7 +241,7 @@ public void run() { } } catch (InterruptedException e) { logger.info( - "[plugin={}] Plugin monitoring stopped, possibly because there is no more registered observer", + "[plugin={}] Reader monitoring stopped, possibly because there is no more registered observer", getName()); // Restore interrupted state... Thread.currentThread().interrupt(); diff --git a/src/main/java/org/eclipse/keyple/core/service/ObservableLocalReaderAdapter.java b/src/main/java/org/eclipse/keyple/core/service/ObservableLocalReaderAdapter.java index 096ec31..c60989b 100644 --- a/src/main/java/org/eclipse/keyple/core/service/ObservableLocalReaderAdapter.java +++ b/src/main/java/org/eclipse/keyple/core/service/ObservableLocalReaderAdapter.java @@ -458,7 +458,7 @@ final void unregister() { stateService.shutdown(); } catch (Exception e) { logger.warn( - "[reader={}] Failed to stop card detection [reason={}]", getName(), e.getMessage()); + "[reader={}] Failed to stop card monitoring [reason={}]", getName(), e.getMessage()); } notifyObservers( new ReaderEventAdapter(getPluginName(), getName(), CardReaderEvent.Type.UNAVAILABLE, null)); @@ -541,7 +541,8 @@ public final void clearObservers() { public final void startCardDetection(DetectionMode detectionMode) { // RL-DET-REMCTRL.1 checkStatus(); - logger.info("[reader={}] Starting card detection [detectionMode={}]", getName(), detectionMode); + logger.info( + "[reader={}] Starting card monitoring [detectionMode={}]", getName(), detectionMode); Assert.getInstance().notNull(detectionMode, "detectionMode"); this.detectionMode = detectionMode; stateService.onEvent(InternalEvent.START_DETECT); @@ -555,7 +556,7 @@ public final void startCardDetection(DetectionMode detectionMode) { @Override public final void stopCardDetection() { // RL-DET-REMCTRL.1 - logger.info("[reader={}] Stopping card detection", getName()); + logger.info("[reader={}] Stopping card monitoring", getName()); stateService.onEvent(InternalEvent.STOP_DETECT); } diff --git a/src/main/java/org/eclipse/keyple/core/service/ObservableRemotePluginAdapter.java b/src/main/java/org/eclipse/keyple/core/service/ObservableRemotePluginAdapter.java index 79117da..9983feb 100644 --- a/src/main/java/org/eclipse/keyple/core/service/ObservableRemotePluginAdapter.java +++ b/src/main/java/org/eclipse/keyple/core/service/ObservableRemotePluginAdapter.java @@ -145,7 +145,7 @@ public void addObserver(PluginObserverSpi observer) { observationManager.addObserver(observer); if (observationManager.countObservers() == 1) { - logger.info("[plugin={}] Starting plugin monitoring", getName()); + logger.info("[plugin={}] Starting remote reader monitoring", getName()); // Start the observation remotely. JsonObject input = new JsonObject(); @@ -164,6 +164,8 @@ public void addObserver(PluginObserverSpi observer) { // Notify the SPI. observableRemotePluginSpi.onStartObservation(); + + logger.info("[plugin={}] Remote reader monitoring started", getName()); } } @@ -197,7 +199,7 @@ public void clearObservers() { /** Stops the monitoring of the plugin. */ private void stopPluginMonitoring() { - logger.info("[plugin={}] Stopping plugin monitoring", getName()); + logger.info("[plugin={}] Stopping remote reader monitoring", getName()); // Notify the SPI first. observableRemotePluginSpi.onStopObservation(); @@ -216,7 +218,7 @@ private void stopPluginMonitoring() { } catch (Exception e) { throwRuntimeException(e); } - logger.info("[plugin={}] Plugin monitoring stopped", getName()); + logger.info("[plugin={}] Remote reader monitoring stopped", getName()); } /** @@ -249,12 +251,6 @@ public void setPluginObservationExceptionHandler( public void addRemoteReader(RemoteReaderSpi remoteReaderSpi, int clientCoreApiLevel) { checkStatus(); - if (logger.isDebugEnabled()) { - logger.debug( - "[plugin={}] Registering remote reader [name={}]", - getName(), - remoteReaderSpi != null ? remoteReaderSpi.getName() : null); - } Assert.getInstance().notNull(remoteReaderSpi, "remoteReaderSpi"); // Create the reader. @@ -272,6 +268,11 @@ public void addRemoteReader(RemoteReaderSpi remoteReaderSpi, int clientCoreApiLe getReadersMap().put(remoteReaderAdapter.getName(), remoteReaderAdapter); remoteReaderAdapter.register(); + if (logger.isDebugEnabled()) { + logger.debug( + "[plugin={}] Remote reader registered [reader={}]", getName(), remoteReaderSpi.getName()); + } + // Notify observers for a plugin event. notifyObservers( new PluginEventAdapter( @@ -286,10 +287,6 @@ public void addRemoteReader(RemoteReaderSpi remoteReaderSpi, int clientCoreApiLe @Override public void removeRemoteReader(String remoteReaderName) { - if (logger.isDebugEnabled()) { - logger.debug( - "[plugin={}] Unregistering remote reader [name={}]", getName(), remoteReaderName); - } Assert.getInstance().notEmpty(remoteReaderName, "remoteReaderName"); CardReader reader = getReader(remoteReaderName); @@ -301,6 +298,11 @@ public void removeRemoteReader(String remoteReaderName) { throw new IllegalArgumentException( "Reader '" + remoteReaderName + "' is not found, not registered or not remote"); } + + if (logger.isDebugEnabled()) { + logger.debug( + "[plugin={}] Remote reader unregistered [reader={}]", getName(), remoteReaderName); + } } /** @@ -313,7 +315,7 @@ public void onPluginEvent(String jsonData) { checkStatus(); if (logger.isDebugEnabled()) { - logger.debug("[plugin={}] Receiving remote plugin event [jsonData={}]", getName(), jsonData); + logger.debug("[plugin={}] Remote plugin event received [jsonData={}]", getName(), jsonData); } Assert.getInstance().notEmpty(jsonData, "jsonData"); diff --git a/src/main/java/org/eclipse/keyple/core/service/ObservableRemoteReaderAdapter.java b/src/main/java/org/eclipse/keyple/core/service/ObservableRemoteReaderAdapter.java index e202279..2562e86 100644 --- a/src/main/java/org/eclipse/keyple/core/service/ObservableRemoteReaderAdapter.java +++ b/src/main/java/org/eclipse/keyple/core/service/ObservableRemoteReaderAdapter.java @@ -173,7 +173,7 @@ void unregister() { stopCardDetection(); } catch (Exception e) { logger.warn( - "[reader={}] Failed to stop card detection [reason={}]", getName(), e.getMessage()); + "[reader={}] Failed to stop card monitoring [reason={}]", getName(), e.getMessage()); } notifyObservers( new ReaderEventAdapter(getPluginName(), getName(), CardReaderEvent.Type.UNAVAILABLE, null)); @@ -234,7 +234,8 @@ public void clearObservers() { public void startCardDetection(DetectionMode detectionMode) { checkStatus(); - logger.info("[reader={}] Starting card detection [detectionMode={}]", getName(), detectionMode); + logger.info( + "[reader={}] Starting remote card monitoring [detectionMode={}]", getName(), detectionMode); Assert.getInstance().notNull(detectionMode, "detectionMode"); // Build the input JSON data. @@ -259,6 +260,8 @@ public void startCardDetection(DetectionMode detectionMode) { // Notify the SPI. observableRemoteReaderSpi.onStartObservation(); + + logger.info("[reader={}] Remote card monitoring started", getName()); } /** @@ -269,7 +272,7 @@ public void startCardDetection(DetectionMode detectionMode) { @Override public void stopCardDetection() { - logger.info("[reader={}] Stopping card detection", getName()); + logger.info("[reader={}] Stopping remote card monitoring", getName()); // Notify the SPI first. observableRemoteReaderSpi.onStopObservation(); @@ -288,6 +291,7 @@ public void stopCardDetection() { } catch (Exception e) { throwRuntimeException(e); } + logger.info("[reader={}] Remote card monitoring stopped", getName()); } /** @@ -298,7 +302,7 @@ public void stopCardDetection() { @Override public void finalizeCardProcessing() { - logger.info("[reader={}] Starting card removal sequence", getName()); + logger.info("[reader={}] Starting remote card removal sequence", getName()); // Build the input JSON data. JsonObject input = new JsonObject(); diff --git a/src/main/java/org/eclipse/keyple/core/service/ObservationManagerAdapter.java b/src/main/java/org/eclipse/keyple/core/service/ObservationManagerAdapter.java index 58c30ac..058e5e0 100644 --- a/src/main/java/org/eclipse/keyple/core/service/ObservationManagerAdapter.java +++ b/src/main/java/org/eclipse/keyple/core/service/ObservationManagerAdapter.java @@ -64,10 +64,6 @@ final class ObservationManagerAdapter { * @since 2.0.0 */ void addObserver(T observer) { - logger.info( - "{} Adding observer [className={}]", - ownerComponent, - observer != null ? observer.getClass().getSimpleName() : null); Assert.getInstance().notNull(observer, "observer"); if (exceptionHandler == null) { throw new IllegalStateException("No exception handler is defined"); @@ -75,6 +71,8 @@ void addObserver(T observer) { synchronized (monitor) { observers.add(observer); } + logger.info( + "{} Observer added [className={}]", ownerComponent, observer.getClass().getSimpleName()); } /** @@ -85,13 +83,13 @@ void addObserver(T observer) { * @since 2.0.0 */ void removeObserver(T observer) { - logger.info( - "{} Removing observer [className={}]", - ownerComponent, - observer != null ? observer.getClass().getSimpleName() : null); synchronized (monitor) { observers.remove(observer); } + logger.info( + "{} Observer removed [className={}]", + ownerComponent, + observer != null ? observer.getClass().getSimpleName() : null); } /** @@ -100,10 +98,10 @@ void removeObserver(T observer) { * @since 2.0.0 */ void clearObservers() { - logger.info("{} Removing all observers", ownerComponent); synchronized (monitor) { observers.clear(); } + logger.info("{} Observers removed", ownerComponent); } /** diff --git a/src/main/java/org/eclipse/keyple/core/service/RemotePluginAdapter.java b/src/main/java/org/eclipse/keyple/core/service/RemotePluginAdapter.java index 32172c8..0b387f8 100644 --- a/src/main/java/org/eclipse/keyple/core/service/RemotePluginAdapter.java +++ b/src/main/java/org/eclipse/keyple/core/service/RemotePluginAdapter.java @@ -115,7 +115,7 @@ final void register() throws PluginIOException { observableRemoteReaderSpi, getName(), CORE_API_LEVEL); } catch (IllegalStateException e) { logger.warn( - "[plugin={}] Failed to create observable remote reader [remoteReaderName={}, localReaderName={}, reason={}]", + "[plugin={}] Failed to create observable remote reader [remoteReader={}, localReader={}, reason={}]", getName(), remoteReaderName, localReaderName, @@ -133,6 +133,8 @@ final void register() throws PluginIOException { getReadersMap().put(localReaderName, remoteReaderAdapter); remoteReaderAdapter.register(); } + + logger.info("[plugin={}] Distributed remote plugin registered", getName()); } /** @@ -163,7 +165,7 @@ public final void onReaderEvent(String jsonData) { checkStatus(); if (logger.isDebugEnabled()) { - logger.debug("[plugin={}] Receiving remote reader event [jsonData={}]", getName(), jsonData); + logger.debug("[plugin={}] Remote reader event received [jsonData={}]", getName(), jsonData); } Assert.getInstance().notEmpty(jsonData, "jsonData"); diff --git a/src/main/java/org/eclipse/keyple/core/service/RemotePoolPluginAdapter.java b/src/main/java/org/eclipse/keyple/core/service/RemotePoolPluginAdapter.java index a7e8b9b..eea1332 100644 --- a/src/main/java/org/eclipse/keyple/core/service/RemotePoolPluginAdapter.java +++ b/src/main/java/org/eclipse/keyple/core/service/RemotePoolPluginAdapter.java @@ -60,7 +60,7 @@ void register() throws PluginIOException { super.register(); int distributedApiLevel = remotePoolPluginSpi.exchangeApiLevel(CORE_API_LEVEL); logger.info( - "[plugin={}] Registering distributed remote pool plugin [coreApiLevel={}, remotePluginApiLevel={}]", + "[plugin={}] Distributed remote pool plugin registered [coreApiLevel={}, remotePluginApiLevel={}]", getName(), CORE_API_LEVEL, distributedApiLevel); @@ -191,6 +191,10 @@ public CardReader allocateReader(String readerGroupReference) { getReadersMap().put(remoteReaderSpi.getName(), remoteReaderAdapter); remoteReaderAdapter.register(); + + if (logger.isDebugEnabled()) { + logger.debug("[plugin={}] Reader allocated", getName()); + } return remoteReaderAdapter; } @@ -217,7 +221,7 @@ public void releaseReader(CardReader reader) { checkStatus(); if (logger.isDebugEnabled()) { logger.debug( - "[plugin={}] Releasing reader [name={}]", + "[plugin={}] Releasing reader [reader={}]", getName(), reader != null ? reader.getName() : null); } @@ -247,5 +251,9 @@ public void releaseReader(CardReader reader) { getReadersMap().remove(reader.getName()); ((RemoteReaderAdapter) reader).unregister(); } + + if (logger.isDebugEnabled()) { + logger.debug("[plugin={}] Reader released", getName()); + } } } diff --git a/src/main/java/org/eclipse/keyple/core/service/SmartCardServiceAdapter.java b/src/main/java/org/eclipse/keyple/core/service/SmartCardServiceAdapter.java index 5b8dc34..f3bfbde 100644 --- a/src/main/java/org/eclipse/keyple/core/service/SmartCardServiceAdapter.java +++ b/src/main/java/org/eclipse/keyple/core/service/SmartCardServiceAdapter.java @@ -307,7 +307,7 @@ private void checkDistributedLocalServiceVersion(LocalServiceFactorySpi localSer * @throws IllegalStateException if the plugin is already registered. */ private void checkPluginRegistration(String pluginName) { - logger.info("Registering plugin [name={}]", pluginName); + logger.info("Registering plugin [plugin={}]", pluginName); Assert.getInstance().notEmpty(pluginName, "pluginName"); if (plugins.containsKey(pluginName)) { throw new IllegalStateException( @@ -322,7 +322,8 @@ private void checkPluginRegistration(String pluginName) { * @throws IllegalStateException if the distributed local service is already registered. */ private void checkDistributedLocalServiceRegistration(String distributedLocalServiceName) { - logger.info("Registering distributed local service [name={}]", distributedLocalServiceName); + logger.info( + "Registering distributed local service [localService={}]", distributedLocalServiceName); Assert.getInstance().notEmpty(distributedLocalServiceName, "distributedLocalServiceName"); if (distributedLocalServices.containsKey(distributedLocalServiceName)) { throw new IllegalStateException( @@ -474,7 +475,7 @@ private AbstractPluginAdapter createRemotePlugin(RemotePluginFactorySpi remotePl */ @Override public void unregisterPlugin(String pluginName) { - logger.info("Unregistering plugin [name={}]", pluginName); + logger.info("Unregistering plugin [plugin={}]", pluginName); synchronized (pluginMonitor) { Plugin plugin = plugins.get(pluginName); if (plugin != null) { @@ -484,7 +485,7 @@ public void unregisterPlugin(String pluginName) { plugins.remove(pluginName); } } else { - logger.warn("Plugin not registered [name={}]", pluginName); + logger.warn("Plugin not registered [plugin={}]", pluginName); } } } @@ -639,7 +640,8 @@ public DistributedLocalService registerDistributedLocalService( */ @Override public void unregisterDistributedLocalService(String distributedLocalServiceName) { - logger.info("Unregistering distributed local service [name={}]", distributedLocalServiceName); + logger.info( + "Unregistering distributed local service [localService={}]", distributedLocalServiceName); synchronized (distributedLocalServiceMonitor) { DistributedLocalService localService = distributedLocalServices.remove(distributedLocalServiceName); @@ -647,7 +649,8 @@ public void unregisterDistributedLocalService(String distributedLocalServiceName ((DistributedLocalServiceAdapter) localService).unregister(); } else { logger.warn( - "Distributed local service not registered [name={}]", distributedLocalServiceName); + "Distributed local service not registered [localService={}]", + distributedLocalServiceName); } } }