Simplify LOG references

There is no need to refer to LOG via BGPProtocolSessionPromise,
this cleans up the code.

Change-Id: Ifb3c23e14eef23f60e01e67c42a1085409faa49a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit f0cf17c32072fc5f4f3489e82ee0766a459640db)

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPProtocolSessionPromise.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPProtocolSessionPromise.java
index cdf5e85964e3341a94d1d28181271381e746a2df..501346a78d0b38b5422282b2806551e1666497f3 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPProtocolSessionPromise.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPProtocolSessionPromise.java
@@ -7,9 +7,9 @@
  */
 package org.opendaylight.protocol.bgp.rib.impl.protocol;
 
+import static com.google.common.base.Preconditions.checkState;
 import static java.util.Objects.requireNonNull;
 
-import com.google.common.base.Preconditions;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
@@ -140,20 +140,19 @@ public final class BGPProtocolSessionPromise<S extends BGPSession> extends Defau
         @Override
         public void operationComplete(final ChannelFuture channelFuture) throws Exception {
             synchronized (BGPProtocolSessionPromise.this) {
-                BGPProtocolSessionPromise.LOG.debug("Promise {} connection resolved", BGPProtocolSessionPromise.this);
-                Preconditions.checkState(BGPProtocolSessionPromise.this.pending.equals(channelFuture));
+                LOG.debug("Promise {} connection resolved", BGPProtocolSessionPromise.this);
+                checkState(BGPProtocolSessionPromise.this.pending.equals(channelFuture), "Unexpected promise %s",
+                    channelFuture);
                 if (BGPProtocolSessionPromise.this.isCancelled()) {
                     if (channelFuture.isSuccess()) {
-                        BGPProtocolSessionPromise.LOG.debug("Closing channel for cancelled promise {}",
-                                BGPProtocolSessionPromise.this);
+                        LOG.debug("Closing channel for cancelled promise {}", BGPProtocolSessionPromise.this);
                         channelFuture.channel().close();
                     }
                 } else if (channelFuture.isSuccess()) {
-                    BGPProtocolSessionPromise.LOG.debug("Promise {} connection successful",
-                            BGPProtocolSessionPromise.this);
+                    LOG.debug("Promise {} connection successful", BGPProtocolSessionPromise.this);
                 } else {
-                    BGPProtocolSessionPromise.LOG.warn("Attempt to connect to {} failed",
-                            BGPProtocolSessionPromise.this.address, channelFuture.cause());
+                    LOG.warn("Attempt to connect to {} failed", BGPProtocolSessionPromise.this.address,
+                        channelFuture.cause());
                     BGPProtocolSessionPromise.this.reconnect();
                 }
             }
@@ -169,28 +168,25 @@ public final class BGPProtocolSessionPromise<S extends BGPSession> extends Defau
 
         @Override
         public void onSessionCreated(@Nonnull final IpAddress ip) {
-            if (!ip.equals(this.peerAddress)) {
-                return;
-            }
-            BGPProtocolSessionPromise.LOG.debug("Callback for session creation with peer {} received", ip);
-            synchronized (BGPProtocolSessionPromise.this) {
-                BGPProtocolSessionPromise.this.peerSessionPresent = true;
+            if (ip.equals(this.peerAddress)) {
+                BGPProtocolSessionPromise.LOG.debug("Callback for session creation with peer {} received", ip);
+                synchronized (BGPProtocolSessionPromise.this) {
+                    BGPProtocolSessionPromise.this.peerSessionPresent = true;
+                }
             }
         }
 
         @Override
         public void onSessionRemoved(@Nonnull final IpAddress ip) {
-            if (!ip.equals(this.peerAddress)) {
-                return;
-            }
-            BGPProtocolSessionPromise.LOG.debug("Callback for session removal with peer {} received", ip);
-            synchronized (BGPProtocolSessionPromise.this) {
-                BGPProtocolSessionPromise.this.peerSessionPresent = false;
-                if (BGPProtocolSessionPromise.this.connectSkipped) {
-                    BGPProtocolSessionPromise.this.connect();
+            if (ip.equals(this.peerAddress)) {
+                BGPProtocolSessionPromise.LOG.debug("Callback for session removal with peer {} received", ip);
+                synchronized (BGPProtocolSessionPromise.this) {
+                    BGPProtocolSessionPromise.this.peerSessionPresent = false;
+                    if (BGPProtocolSessionPromise.this.connectSkipped) {
+                        BGPProtocolSessionPromise.this.connect();
+                    }
                 }
             }
         }
     }
-
 }