From 474a3348cb0a272c6c6dde7089c68497ad619198 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 20 Sep 2016 03:51:07 +0200 Subject: [PATCH 1/1] Use ImmutableMap instead of Collections.emptyMap() ImmutableMap behaves nicely when it meets copying and can be checked for. Change-Id: I2e0b52b8ea83c69e4ace3364904975b806a67aae Signed-off-by: Robert Varga --- .../dom/store/inmemory/WriteableSubshardBoundaryNode.java | 4 ++-- .../dom/store/inmemory/WriteableSubshardBoundaryNodeTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/WriteableSubshardBoundaryNode.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/WriteableSubshardBoundaryNode.java index 73c5681ba4..2aefbd5fa9 100644 --- a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/WriteableSubshardBoundaryNode.java +++ b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/WriteableSubshardBoundaryNode.java @@ -9,7 +9,7 @@ package org.opendaylight.mdsal.dom.store.inmemory; import com.google.common.base.Preconditions; -import java.util.Collections; +import com.google.common.collect.ImmutableMap; import java.util.Map; import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteCursor; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; @@ -69,6 +69,6 @@ final class WriteableSubshardBoundaryNode extends WriteableModificationNode { @Override Map getChildrenWithSubshards() { - return Collections.emptyMap(); + return ImmutableMap.of(); } } diff --git a/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/mdsal/dom/store/inmemory/WriteableSubshardBoundaryNodeTest.java b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/mdsal/dom/store/inmemory/WriteableSubshardBoundaryNodeTest.java index 443a972d9c..de9b073f65 100644 --- a/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/mdsal/dom/store/inmemory/WriteableSubshardBoundaryNodeTest.java +++ b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/mdsal/dom/store/inmemory/WriteableSubshardBoundaryNodeTest.java @@ -21,7 +21,7 @@ import static org.opendaylight.mdsal.dom.store.inmemory.TestUtils.DOM_DATA_TREE_ import static org.opendaylight.mdsal.dom.store.inmemory.TestUtils.DOM_DATA_TREE_WRITE_CURSOR; import static org.opendaylight.mdsal.dom.store.inmemory.TestUtils.resetMocks; -import java.util.Collections; +import com.google.common.collect.ImmutableMap; import org.junit.After; import org.junit.Test; @@ -62,7 +62,7 @@ public class WriteableSubshardBoundaryNodeTest { WriteableSubshardBoundaryNode.from(FOREIGN_SHARD_MODIFICATION_CONTEXT); assertNotNull(writeableSubshardBoundaryNode.getChildrenWithSubshards()); - assertSame(Collections.emptyMap(),writeableSubshardBoundaryNode.getChildrenWithSubshards()); + assertSame(ImmutableMap.of(), writeableSubshardBoundaryNode.getChildrenWithSubshards()); assertEquals(DOM_DATA_TREE_IDENTIFIER.getRootIdentifier().getLastPathArgument(), writeableSubshardBoundaryNode.getIdentifier()); assertNull(writeableSubshardBoundaryNode.getChild(null)); -- 2.36.6