Cleanup ReconciliationTask

This is a simple upkeep, converting primarily converting to use
Objects.requireNonNull().

JIRA: OVSDB-413
Change-Id: I0ccf60e14899f90a7f8eead9bf8f75ae94d30857
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/ReconciliationTask.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/ReconciliationTask.java
index f40aa006951cad6f98bd83f99be810b53cde56b9..4f8db84693b308d812ec06dc43249fe3745b45e0 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/ReconciliationTask.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/ReconciliationTask.java
@@ -7,13 +7,12 @@
  */
 package org.opendaylight.ovsdb.southbound.reconciliation;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import org.opendaylight.ovsdb.southbound.OvsdbConnectionManager;
 import org.opendaylight.ovsdb.southbound.reconciliation.connection.ConnectionReconciliationTask;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Abstract implementation of a reconciliation task. Each new type of
@@ -21,23 +20,17 @@ import org.slf4j.LoggerFactory;
  * and implement the abstract methods.
  */
 public abstract class ReconciliationTask implements Runnable {
-
-    private static final Logger LOG = LoggerFactory.getLogger(ReconciliationTask.class);
-
     protected final ReconciliationManager reconciliationManager;
     protected final OvsdbConnectionManager connectionManager;
     protected final InstanceIdentifier<?> nodeIid;
     protected final DataObject configData;
 
-    protected ReconciliationTask(ReconciliationManager reconciliationManager, OvsdbConnectionManager connectionManager,
-                                 InstanceIdentifier<?> nodeIid,
-                                 DataObject configData) {
-        Preconditions.checkNotNull(reconciliationManager, "Reconciliation manager must not be null");
-        Preconditions.checkNotNull(connectionManager, "Connection manager must not be null");
-        Preconditions.checkNotNull(nodeIid, "Node Iid must not be null");
-        this.reconciliationManager = reconciliationManager;
-        this.connectionManager = connectionManager;
-        this.nodeIid = nodeIid;
+    protected ReconciliationTask(final ReconciliationManager reconciliationManager,
+                                 final OvsdbConnectionManager connectionManager,
+                                 final InstanceIdentifier<?> nodeIid, final DataObject configData) {
+        this.reconciliationManager = requireNonNull(reconciliationManager, "Reconciliation manager must not be null");
+        this.connectionManager = requireNonNull(connectionManager, "Connection manager must not be null");
+        this.nodeIid = requireNonNull(nodeIid, "Node Iid must not be null");
         this.configData = configData;
     }
 
@@ -95,7 +88,7 @@ public abstract class ReconciliationTask implements Runnable {
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (this == obj) {
             return true;
         }
@@ -103,9 +96,8 @@ public abstract class ReconciliationTask implements Runnable {
             return false;
         }
 
-        ReconciliationTask that = (ReconciliationTask) obj;
-
-        return nodeIid.equals(that.nodeIid);
+        final ReconciliationTask other = (ReconciliationTask) obj;
+        return nodeIid.equals(other.nodeIid);
     }
 
     @Override
@@ -113,7 +105,6 @@ public abstract class ReconciliationTask implements Runnable {
         return getClass().hashCode() + nodeIid.hashCode();
     }
 
-
     @Override
     public String toString() {
         return "ReconciliationTask{ type=" + getClass().toString() + ", nodeIid=" + nodeIid + '}';