Repository: reef Updated Branches: refs/heads/master 987240cb7 -> 3a3e1e2bb
[REEF-1903] Use Class.getCanonicalName() in HandlerContainer and RemoteManager Use `Class.getCanonicalName()` instead of just `.getName()` to log class names of the objects being handled by the `DefaultRemoteManagerImplementation` and the `HandlerContainer` to produce human-readable class names for objects like `byte[]` etc. JIRA: [REEF-1903](https://issues.apache.org/jira/browse/REEF-1903) Pull Request: Closes #1392 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/3a3e1e2b Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/3a3e1e2b Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/3a3e1e2b Branch: refs/heads/master Commit: 3a3e1e2bb802ea8ffc0f6edbb1d9668e942b531e Parents: 987240c Author: Sergiy Matusevych <[email protected]> Authored: Wed Oct 18 16:22:15 2017 -0700 Committer: Doug Service <[email protected]> Committed: Thu Oct 19 03:10:15 2017 +0000 ---------------------------------------------------------------------- .../impl/DefaultRemoteManagerImplementation.java | 15 +++++++-------- .../reef/wake/remote/impl/HandlerContainer.java | 6 +++--- 2 files changed, 10 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/3a3e1e2b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/DefaultRemoteManagerImplementation.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/DefaultRemoteManagerImplementation.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/DefaultRemoteManagerImplementation.java index 28681de..4566aca 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/DefaultRemoteManagerImplementation.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/DefaultRemoteManagerImplementation.java @@ -117,7 +117,7 @@ public final class DefaultRemoteManagerImplementation implements RemoteManager { if (LOG.isLoggable(Level.FINE)) { LOG.log(Level.FINE, "RemoteManager: {0} destinationIdentifier: {1} messageType: {2}", - new Object[] {this.name, destinationIdentifier, messageType.getName()}); + new Object[] {this.name, destinationIdentifier, messageType.getCanonicalName()}); } return new ProxyEventHandler<>(this.myIdentifier, destinationIdentifier, @@ -130,12 +130,11 @@ public final class DefaultRemoteManagerImplementation implements RemoteManager { */ @Override public <T, U extends T> AutoCloseable registerHandler( - final RemoteIdentifier sourceIdentifier, - final Class<U> messageType, final EventHandler<T> theHandler) { + final RemoteIdentifier sourceIdentifier, final Class<U> messageType, final EventHandler<T> theHandler) { if (LOG.isLoggable(Level.FINE)) { - LOG.log(Level.FINE, "RemoteManager: {0} remoteid: {1} messageType: {2} handler: {3}", - new Object[] {this.name, sourceIdentifier, messageType.getName(), theHandler.getClass().getName()}); + LOG.log(Level.FINE, "RemoteManager: {0} remoteId: {1} messageType: {2} handler: {3}", new Object[] { + this.name, sourceIdentifier, messageType.getCanonicalName(), theHandler.getClass().getCanonicalName()}); } return this.handlerContainer.registerHandler(sourceIdentifier, messageType, theHandler); @@ -149,8 +148,8 @@ public final class DefaultRemoteManagerImplementation implements RemoteManager { final Class<U> messageType, final EventHandler<RemoteMessage<T>> theHandler) { if (LOG.isLoggable(Level.FINE)) { - LOG.log(Level.FINE, "RemoteManager: {0} messageType: {1} handler: {2}", - new Object[] {this.name, messageType.getName(), theHandler.getClass().getName()}); + LOG.log(Level.FINE, "RemoteManager: {0} messageType: {1} handler: {2}", new Object[] { + this.name, messageType.getCanonicalName(), theHandler.getClass().getCanonicalName()}); } return this.handlerContainer.registerHandler(messageType, theHandler); @@ -235,6 +234,6 @@ public final class DefaultRemoteManagerImplementation implements RemoteManager { @Override public String toString() { - return String.format("RemoteManager: { id:%s handler:%s }", this.myIdentifier, this.handlerContainer); + return String.format("RemoteManager: { id: %s handler: %s }", this.myIdentifier, this.handlerContainer); } } http://git-wip-us.apache.org/repos/asf/reef/blob/3a3e1e2b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/HandlerContainer.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/HandlerContainer.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/HandlerContainer.java index ebe8906..3a2772f 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/HandlerContainer.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/HandlerContainer.java @@ -89,7 +89,7 @@ final class HandlerContainer<T> implements EventHandler<RemoteEvent<byte[]>> { LOG.log(Level.FINER, "Add handler for tuple: {0},{1}", - new Object[] {tuple.getT1(), tuple.getT2().getName()}); + new Object[] {tuple.getT1(), tuple.getT2().getCanonicalName()}); return new SubscriptionHandler<>(tuple, this.unsubscribeTuple); } @@ -106,7 +106,7 @@ final class HandlerContainer<T> implements EventHandler<RemoteEvent<byte[]>> { this.msgTypeToHandlerMap.put(messageType, theHandler); - LOG.log(Level.FINER, "Add handler for class: {0}", messageType.getName()); + LOG.log(Level.FINER, "Add handler for class: {0}", messageType.getCanonicalName()); return new SubscriptionHandler<>(messageType, this.unsubscribeClass); } @@ -141,7 +141,7 @@ final class HandlerContainer<T> implements EventHandler<RemoteEvent<byte[]>> { this.msgTypeToHandlerMap.remove(token); } else { throw new RemoteRuntimeException( - "Unknown subscription type: " + subscription.getClass().getName()); + "Unknown subscription type: " + subscription.getClass().getCanonicalName()); } }
