BUG-2383: rename BGPSessionImpl.sendMessage()

The method performs a write-and-flush, so let's call it writeAndFlush().

Change-Id: I20bc4db103f2a671bed0f33919ae3978c892af11
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImpl.java
index 37bfae4e0b05170be22831eab0f637f373692e30..ba4e1a455240002b643c0f7062a011f78f100c9b 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImpl.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImpl.java
@@ -173,7 +173,7 @@ public class BGPSessionImpl extends AbstractProtocolSession<Notification> implem
         LOG.info("Closing session: {}", this);
 
         if (this.state != State.IDLE) {
-            this.sendMessage(new NotifyBuilder().setErrorCode(BGPError.CEASE.getCode()).setErrorSubcode(
+            this.writeAndFlush(new NotifyBuilder().setErrorCode(BGPError.CEASE.getCode()).setErrorSubcode(
                     BGPError.CEASE.getSubcode()).build());
             removePeerSession();
             this.channel.close();
@@ -260,7 +260,7 @@ public class BGPSessionImpl extends AbstractProtocolSession<Notification> implem
         }
     }
 
-    synchronized void sendMessage(final Notification msg) {
+    synchronized void writeAndFlush(final Notification msg) {
         writeEpilogue(this.channel.writeAndFlush(msg), msg);
     }
 
@@ -278,7 +278,7 @@ public class BGPSessionImpl extends AbstractProtocolSession<Notification> implem
      * @param closeObject
      */
     private void terminate(final BGPError error) {
-        this.sendMessage(new NotifyBuilder().setErrorCode(error.getCode()).setErrorSubcode(error.getSubcode()).build());
+        this.writeAndFlush(new NotifyBuilder().setErrorCode(error.getCode()).setErrorSubcode(error.getSubcode()).build());
         this.closeWithoutMessage();
 
         this.listener.onSessionTerminated(this, new BGPTerminationReason(error));
@@ -332,7 +332,7 @@ public class BGPSessionImpl extends AbstractProtocolSession<Notification> implem
         long nextKeepalive = this.lastMessageSentAt + TimeUnit.SECONDS.toNanos(this.keepAlive);
 
         if (ct >= nextKeepalive) {
-            this.sendMessage(KEEP_ALIVE);
+            this.writeAndFlush(KEEP_ALIVE);
             nextKeepalive = this.lastMessageSentAt + TimeUnit.SECONDS.toNanos(this.keepAlive);
             this.sessionStats.updateSentMsgKA();
         }

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ChannelOutputLimiter.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ChannelOutputLimiter.java
index 7b342f8584b5ae78b79deccf03a928932441a9da..3a610b6221eb725b8c80bd0d08d9fae15728d72c 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ChannelOutputLimiter.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ChannelOutputLimiter.java
@@ -54,7 +54,7 @@ final class ChannelOutputLimiter extends ChannelInboundHandlerAdapter {
 
     void writeAndFlush(final Notification msg) {
         ensureWritable();
-        session.sendMessage(msg);
+        session.writeAndFlush(msg);
     }
 
     void flush() {

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/SessionRIBsOut.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/SessionRIBsOut.java
index 352420fae2916e8057c2fd9588b4d81aa61d061b..783ce132e15f195f424067eeb3974016e812f416 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/SessionRIBsOut.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/SessionRIBsOut.java
@@ -30,7 +30,7 @@ final class SessionRIBsOut extends AbstractAdjRIBsOut implements Runnable {
 
     @Override
     protected boolean writePDU(final Update pdu) {
-        session.sendMessage(pdu);
+        session.writeAndFlush(pdu);
         return session.isWritable();
     }
 

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SpeakerSessionMock.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SpeakerSessionMock.java
index 09ef537bf0a685116da01c368235ff6cd4fc7d75..7f640f98d28c00569bb2978b137130c6abdaebef 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SpeakerSessionMock.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SpeakerSessionMock.java
@@ -27,7 +27,7 @@ public class SpeakerSessionMock extends BGPSessionImpl {
     }
 
     @Override
-    public void sendMessage(final Notification msg) {
+    public void writeAndFlush(final Notification msg) {
         this.setLastMessageSentAt(System.nanoTime());
         this.client.onMessage(this, msg);
     }