Clean up

- Remove deprecated
- Declare some fields as final
- Remove some redundancies

Signed-off-by: David Suárez <david.suarez.fuentes@gmail.com>
Change-Id: I03c0dc552768ae13e1f0a350e3802ac9e52446f5

diff --git a/arputil/arputil-impl/src/main/java/org/opendaylight/genius/arputil/internal/ArpUtilCounters.java b/arputil/arputil-impl/src/main/java/org/opendaylight/genius/arputil/internal/ArpUtilCounters.java
index 262a940cd1aec2f55a361229395bada99cf806a5..52c8e56fca852e73f73389a7c9acc4ff56ea5e3e 100644 (file)
--- a/arputil/arputil-impl/src/main/java/org/opendaylight/genius/arputil/internal/ArpUtilCounters.java
+++ b/arputil/arputil-impl/src/main/java/org/opendaylight/genius/arputil/internal/ArpUtilCounters.java
@@ -18,7 +18,7 @@ public enum ArpUtilCounters {
     arp_req_rcv_notification,
     arp_req_rcv_notification_rejected;
 
-    private OccurenceCounter counter;
+    private final OccurenceCounter counter;
 
     ArpUtilCounters() {
         counter = new OccurenceCounter(getClass().getSimpleName(), name(), name());

diff --git a/arputil/arputil-impl/src/main/java/org/opendaylight/genius/arputil/internal/ArpUtilImpl.java b/arputil/arputil-impl/src/main/java/org/opendaylight/genius/arputil/internal/ArpUtilImpl.java
index 65ecdb4e3550f9a8a6e08dc0b8becbdd46446913..e265b631d7e86501e530080fe26cdc7ecc0e141b 100644 (file)
--- a/arputil/arputil-impl/src/main/java/org/opendaylight/genius/arputil/internal/ArpUtilImpl.java
+++ b/arputil/arputil-impl/src/main/java/org/opendaylight/genius/arputil/internal/ArpUtilImpl.java
@@ -15,6 +15,7 @@ import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.JdkFutureAdapters;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;
 import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
@@ -162,7 +163,7 @@ public class ArpUtilImpl extends AbstractLifecycle implements OdlArputilService,
                         public void onSuccess(RpcResult<Void> result) {
                             LOG.trace("Successfully sent the arp pkt out for ip {}", dstIpAddress);
                         }
-                    });
+                    }, MoreExecutors.directExecutor());
 
             macAddrs.put(dstIpAddress, ft);
             return ft;
@@ -185,8 +186,8 @@ public class ArpUtilImpl extends AbstractLifecycle implements OdlArputilService,
         byte[] payload;
         String interfaceName = null;
         byte[] srcIpBytes;
-        byte[] dstIpBytes = null;
-        byte[] srcMac = null;
+        byte[] dstIpBytes;
+        byte[] srcMac;
 
         RpcResultBuilder<Void> failureBuilder = RpcResultBuilder.failed();
         RpcResultBuilder<Void> successBuilder = RpcResultBuilder.success();
@@ -420,7 +421,7 @@ public class ArpUtilImpl extends AbstractLifecycle implements OdlArputilService,
     }
 
     private class MacResponderTask implements Runnable {
-        ARP arp;
+        final ARP arp;
 
         MacResponderTask(ARP arp) {
             this.arp = arp;