Enforce RegisterListenerLocal arguments

The fields need to be initialized to non-null, make sure the object
does that (instead of its users).

Change-Id: I545421167bd33e06ea7221a0fbcc136083bfc80d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipService.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipService.java
index 2dab37c585ebb2ed01bb6d29640bcfd476d24590..8eb69daf096321af6672b43264972a928eed55f8 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipService.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipService.java
@@ -166,9 +166,6 @@ public class DistributedEntityOwnershipService implements DOMEntityOwnershipServ
     @Override
     public DOMEntityOwnershipListenerRegistration registerListener(final String entityType,
             final DOMEntityOwnershipListener listener) {
-        Preconditions.checkNotNull(entityType, "entityType cannot be null");
-        Preconditions.checkNotNull(listener, "listener cannot be null");
-
         RegisterListenerLocal registerListener = new RegisterListenerLocal(listener, entityType);
 
         LOG.debug("Registering listener with message: {}", registerListener);

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/messages/RegisterListenerLocal.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/messages/RegisterListenerLocal.java
index dd52cda6b6b977614ad292fe7f2079c9d0c024f2..4dce320c158edde2cba5a358c3a8d959d69df3e7 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/messages/RegisterListenerLocal.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/messages/RegisterListenerLocal.java
@@ -7,6 +7,9 @@
  */
 package org.opendaylight.controller.cluster.datastore.entityownership.messages;
 
+import static java.util.Objects.requireNonNull;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipListener;
 
 /**
@@ -14,13 +17,14 @@ import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipListener;
  *
  * @author Thomas Pantelis
  */
+@NonNullByDefault
 public class RegisterListenerLocal {
     private final DOMEntityOwnershipListener listener;
     private final String entityType;
 
-    public RegisterListenerLocal(DOMEntityOwnershipListener listener, String entityType) {
-        this.listener = listener;
-        this.entityType = entityType;
+    public RegisterListenerLocal(final DOMEntityOwnershipListener listener, final String entityType) {
+        this.listener = requireNonNull(listener, "listener cannot be null");
+        this.entityType = requireNonNull(entityType, "entityType cannot be null");
     }
 
     public DOMEntityOwnershipListener getListener() {