X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Fnetconf-client%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fclient%2FSimpleNetconfClientSessionListener.java;h=0390e637fa970068ca220b558dc6667e573806aa;hb=8aa7c2824179d0510a36e0630640d39b1190003f;hp=b13e05b8b4304b3b746cb8bd0cfc1472c5e6eb8f;hpb=0ddc89fb63ac86e87835388609efa6ef905b2bae;p=netconf.git

diff --git a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListener.java b/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListener.java
index b13e05b8b4..0390e637fa 100644
--- a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListener.java
+++ b/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListener.java
@@ -5,16 +5,17 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.netconf.client;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GlobalEventExecutor;
 import io.netty.util.concurrent.Promise;
 import java.util.ArrayDeque;
 import java.util.Queue;
-import javax.annotation.concurrent.GuardedBy;
+import org.checkerframework.checker.lock.qual.GuardedBy;
+import org.checkerframework.checker.lock.qual.Holding;
 import org.opendaylight.netconf.api.NetconfMessage;
 import org.opendaylight.netconf.api.NetconfTerminationReason;
 import org.slf4j.Logger;
@@ -25,9 +26,9 @@ public class SimpleNetconfClientSessionListener implements NetconfClientSessionL
         private final Promise<NetconfMessage> promise;
         private final NetconfMessage request;
 
-        RequestEntry(Promise<NetconfMessage> future, NetconfMessage request) {
-            this.promise = Preconditions.checkNotNull(future);
-            this.request = Preconditions.checkNotNull(request);
+        RequestEntry(final Promise<NetconfMessage> future, final NetconfMessage request) {
+            this.promise = requireNonNull(future);
+            this.request = requireNonNull(request);
         }
     }
 
@@ -39,7 +40,7 @@ public class SimpleNetconfClientSessionListener implements NetconfClientSessionL
     @GuardedBy("this")
     private NetconfClientSession clientSession;
 
-    @GuardedBy("this")
+    @Holding("this")
     private void dispatchRequest() {
         while (!requests.isEmpty()) {
             final RequestEntry e = requests.peek();
@@ -56,8 +57,8 @@ public class SimpleNetconfClientSessionListener implements NetconfClientSessionL
 
     @Override
     @SuppressWarnings("checkstyle:hiddenField")
-    public final synchronized void onSessionUp(NetconfClientSession clientSession) {
-        this.clientSession = Preconditions.checkNotNull(clientSession);
+    public final synchronized void onSessionUp(final NetconfClientSession clientSession) {
+        this.clientSession = requireNonNull(clientSession);
         LOG.debug("Client session {} went up", clientSession);
         dispatchRequest();
     }
@@ -73,22 +74,22 @@ public class SimpleNetconfClientSessionListener implements NetconfClientSessionL
 
     @Override
     @SuppressWarnings("checkstyle:hiddenField")
-    public final void onSessionDown(NetconfClientSession clientSession, Exception exception) {
+    public final void onSessionDown(final NetconfClientSession clientSession, final Exception exception) {
         LOG.debug("Client Session {} went down unexpectedly", clientSession, exception);
         tearDown(exception);
     }
 
     @Override
     @SuppressWarnings("checkstyle:hiddenField")
-    public final void onSessionTerminated(NetconfClientSession clientSession,
-                                          NetconfTerminationReason netconfTerminationReason) {
+    public final void onSessionTerminated(final NetconfClientSession clientSession,
+                                          final NetconfTerminationReason netconfTerminationReason) {
         LOG.debug("Client Session {} terminated, reason: {}", clientSession,
                 netconfTerminationReason.getErrorMessage());
         tearDown(new RuntimeException(netconfTerminationReason.getErrorMessage()));
     }
 
     @Override
-    public synchronized void onMessage(NetconfClientSession session, NetconfMessage message) {
+    public synchronized void onMessage(final NetconfClientSession session, final NetconfMessage message) {
         LOG.debug("New message arrived: {}", message);
 
         final RequestEntry e = requests.poll();
@@ -100,7 +101,7 @@ public class SimpleNetconfClientSessionListener implements NetconfClientSessionL
         }
     }
 
-    public final synchronized Future<NetconfMessage> sendRequest(NetconfMessage message) {
+    public final synchronized Future<NetconfMessage> sendRequest(final NetconfMessage message) {
         final RequestEntry req = new RequestEntry(GlobalEventExecutor.INSTANCE.newPromise(), message);
 
         requests.add(req);