Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Remove deprecated API elements from protocol framework"
[controller.git]
/
opendaylight
/
netconf
/
netconf-api
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
netconf
/
api
/
NetconfSession.java
diff --git
a/opendaylight/netconf/netconf-api/src/main/java/org/opendaylight/controller/netconf/api/NetconfSession.java
b/opendaylight/netconf/netconf-api/src/main/java/org/opendaylight/controller/netconf/api/NetconfSession.java
index 6c747dbe244fde8812a17a8f923eff49c67fba4d..4770cb128fb7399f50759a2ffb599796001992b6 100644
(file)
--- a/
opendaylight/netconf/netconf-api/src/main/java/org/opendaylight/controller/netconf/api/NetconfSession.java
+++ b/
opendaylight/netconf/netconf-api/src/main/java/org/opendaylight/controller/netconf/api/NetconfSession.java
@@
-8,26
+8,30
@@
package org.opendaylight.controller.netconf.api;
import io.netty.channel.Channel;
package org.opendaylight.controller.netconf.api;
import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+
+import java.io.IOException;
+
import org.opendaylight.protocol.framework.AbstractProtocolSession;
import org.opendaylight.protocol.framework.SessionListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.opendaylight.protocol.framework.AbstractProtocolSession;
import org.opendaylight.protocol.framework.SessionListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
-
public abstract class NetconfSession extends AbstractProtocolSession<NetconfMessage> {
public abstract class NetconfSession extends AbstractProtocolSession<NetconfMessage> {
- pr
otected final Channel channel
;
- private final SessionListener sessionListener;
+ pr
ivate static final Logger logger = LoggerFactory.getLogger(NetconfSession.class)
;
+ private final SessionListener
<NetconfMessage, NetconfSession, NetconfTerminationReason>
sessionListener;
private final long sessionId;
private boolean up = false;
private final long sessionId;
private boolean up = false;
- private static final Logger logger = LoggerFactory.getLogger(NetconfSession.class);
- protected NetconfSession(SessionListener sessionListener, Channel channel, long sessionId) {
+ protected final Channel channel;
+
+ protected NetconfSession(SessionListener<NetconfMessage, NetconfSession, NetconfTerminationReason> sessionListener, Channel channel, long sessionId) {
this.sessionListener = sessionListener;
this.channel = channel;
this.sessionId = sessionId;
logger.debug("Session {} created", toString());
}
this.sessionListener = sessionListener;
this.channel = channel;
this.sessionId = sessionId;
logger.debug("Session {} created", toString());
}
+
@Override
public void close() {
channel.close();
@Override
public void close() {
channel.close();
@@
-41,8
+45,8
@@
public abstract class NetconfSession extends AbstractProtocolSession<NetconfMess
sessionListener.onMessage(this, netconfMessage);
}
sessionListener.onMessage(this, netconfMessage);
}
- public
void
sendMessage(NetconfMessage netconfMessage) {
- channel.writeAndFlush(netconfMessage);
+ public
ChannelFuture
sendMessage(NetconfMessage netconfMessage) {
+
return
channel.writeAndFlush(netconfMessage);
}
@Override
}
@Override
@@
-69,11
+73,11
@@
public abstract class NetconfSession extends AbstractProtocolSession<NetconfMess
return sb.toString();
}
return sb.toString();
}
- public boolean isUp() {
+ public
final
boolean isUp() {
return up;
}
return up;
}
- public long getSessionId() {
+ public
final
long getSessionId() {
return sessionId;
}
}
return sessionId;
}
}