Fix findbugs violations in netconf

[netconf.git] / netconf / netconf-monitoring / src / main / java / org / opendaylight / netconf / monitoring / xml / model / MonitoringSession.java

diff --git a/netconf/netconf-monitoring/src/main/java/org/opendaylight/netconf/monitoring/xml/model/MonitoringSession.java b/netconf/netconf-monitoring/src/main/java/org/opendaylight/netconf/monitoring/xml/model/MonitoringSession.java
index 3b075433d3d3f86f592eec3a984291f1d9bac2d0..7fb3fa11e2d5d5af232ee6fe37afc8d5aef2badc 100644 (file)
--- a/netconf/netconf-monitoring/src/main/java/org/opendaylight/netconf/monitoring/xml/model/MonitoringSession.java
+++ b/netconf/netconf-monitoring/src/main/java/org/opendaylight/netconf/monitoring/xml/model/MonitoringSession.java
@@ -11,7 +11,7 @@ import com.google.common.base.Joiner;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlTransient;
 import org.opendaylight.netconf.monitoring.MonitoringConstants;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.extension.rev131210.Session1;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.sessions.Session;
 import org.opendaylight.yangtools.yang.common.QName;
@@ -21,11 +21,11 @@ final class MonitoringSession {
     @XmlTransient
     private Session managementSession;
 
-    public MonitoringSession(Session managementSession) {
+    MonitoringSession(Session managementSession) {
         this.managementSession = managementSession;
     }
 
-    public MonitoringSession() {
+    MonitoringSession() {
     }
 
     public void setManagementSession(Session managementSession) {
@@ -75,19 +75,20 @@ final class MonitoringSession {
     @XmlElement(name = "transport")
     public String getTransport() {
         try {
-            QName qName = (QName) managementSession.getTransport().getField("QNAME").get(null);
+            QName qualifiedName = (QName) managementSession.getTransport().getField("QNAME").get(null);
             // Add extension prefix if transport type is from extension yang module
-            if (qName.getNamespace().toString().equals(MonitoringConstants.EXTENSION_NAMESPACE)) {
-                return Joiner.on(':').join(MonitoringConstants.EXTENSION_NAMESPACE_PREFIX, qName.getLocalName());
+            if (qualifiedName.getNamespace().toString().equals(MonitoringConstants.EXTENSION_NAMESPACE)) {
+                return Joiner.on(':').join(MonitoringConstants.EXTENSION_NAMESPACE_PREFIX,
+                        qualifiedName.getLocalName());
             } else {
-                return qName.getLocalName();
+                return qualifiedName.getLocalName();
             }
         } catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) {
             throw new IllegalArgumentException("Unknown transport type " + managementSession.getTransport(), e);
         }
     }
 
-    @XmlElement(name= "session-identifier", namespace = MonitoringConstants.EXTENSION_NAMESPACE)
+    @XmlElement(name = "session-identifier", namespace = MonitoringConstants.EXTENSION_NAMESPACE)
     public String getSessionType() {
         return managementSession.getAugmentation(Session1.class).getSessionIdentifier();
     }