From 538d086ee1b4c98c93fc10e7239a15b94a63de21 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 29 Feb 2016 12:36:17 +0100 Subject: [PATCH 1/1] Do not use String.toString() Use Strings.isNullOrEmpty instead of open-coding the check, also add preconditions for fields and eliminate a String.toString() call. Change-Id: Ic25a60511514ea623d1d9bdde9675faec8d538f8 Signed-off-by: Robert Varga --- .../entityownership/EntityOwnerChangeListener.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnerChangeListener.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnerChangeListener.java index d10bc2158a..fcc325e8d7 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnerChangeListener.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnerChangeListener.java @@ -10,6 +10,8 @@ package org.opendaylight.controller.cluster.datastore.entityownership; import static org.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.createEntity; import com.google.common.base.Objects; import com.google.common.base.Optional; +import com.google.common.base.Preconditions; +import com.google.common.base.Strings; import java.util.Collection; import org.opendaylight.controller.md.sal.common.api.clustering.Entity; import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; @@ -30,13 +32,13 @@ class EntityOwnerChangeListener extends AbstractEntityOwnerChangeListener { private final String localMemberName; private final EntityOwnershipListenerSupport listenerSupport; - EntityOwnerChangeListener(String localMemberName, EntityOwnershipListenerSupport listenerSupport) { - this.localMemberName = localMemberName; - this.listenerSupport = listenerSupport; + EntityOwnerChangeListener(final String localMemberName, final EntityOwnershipListenerSupport listenerSupport) { + this.localMemberName = Preconditions.checkNotNull(localMemberName); + this.listenerSupport = Preconditions.checkNotNull(listenerSupport); } @Override - public void onDataTreeChanged(Collection changes) { + public void onDataTreeChanged(final Collection changes) { for(DataTreeCandidate change: changes) { DataTreeCandidateNode changeRoot = change.getRootNode(); LeafNode ownerLeaf = (LeafNode) changeRoot.getDataAfter().get(); @@ -56,7 +58,7 @@ class EntityOwnerChangeListener extends AbstractEntityOwnerChangeListener { if(!Objects.equal(origOwner, newOwner)) { boolean isOwner = Objects.equal(localMemberName, newOwner); boolean wasOwner = Objects.equal(localMemberName, origOwner); - boolean hasOwner = newOwner != null && !newOwner.toString().isEmpty(); + boolean hasOwner = !Strings.isNullOrEmpty(newOwner); Entity entity = createEntity(change.getRootPath()); -- 2.36.6