From 3495e8e67ee130cb83ce19b4b347d8eca5a1bb05 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 8 Nov 2018 00:42:02 +0100
Subject: [PATCH] Cleanup ShardedDOMTransactionChainAdapter

Inner classes have incorrect structure and can be final, fix that
and also eliminate the need to verifyNotNull().

Change-Id: I68a68f69e6e7e7f442783858dfd719e7ca374bfb
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../ShardedDOMTransactionChainAdapter.java    | 62 +++++++++----------
 1 file changed, 29 insertions(+), 33 deletions(-)

diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMTransactionChainAdapter.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMTransactionChainAdapter.java
index ca1ab8c8c5..8ffa21b232 100644
--- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMTransactionChainAdapter.java
+++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMTransactionChainAdapter.java
@@ -8,7 +8,6 @@
 package org.opendaylight.mdsal.dom.broker;
 
 import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.base.Verify.verifyNotNull;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.collect.ClassToInstanceMap;
@@ -159,7 +158,7 @@ public class ShardedDOMTransactionChainAdapter implements DOMTransactionChain {
         finished = true;
     }
 
-    static class CachedDataTreeService implements DOMDataTreeService {
+    private static class CachedDataTreeService implements DOMDataTreeService {
 
         private final DOMDataTreeService delegateTreeService;
         private final Map<LogicalDatastoreType, NoopCloseDataProducer> producersMap =
@@ -188,44 +187,41 @@ public class ShardedDOMTransactionChainAdapter implements DOMTransactionChain {
         @Override
         public DOMDataTreeProducer createProducer(final Collection<DOMDataTreeIdentifier> subtrees) {
             checkState(subtrees.size() == 1);
-            NoopCloseDataProducer producer = null;
-            for (final DOMDataTreeIdentifier treeId : subtrees) {
-                producer = new NoopCloseDataProducer(delegateTreeService.createProducer(Collections.singleton(treeId)));
-                producersMap.putIfAbsent(treeId.getDatastoreType(),
-                        producer);
-            }
-            return verifyNotNull(producer);
+            DOMDataTreeIdentifier treeId = subtrees.iterator().next();
+            NoopCloseDataProducer producer = new NoopCloseDataProducer(delegateTreeService.createProducer(
+                Collections.singleton(treeId)));
+            producersMap.putIfAbsent(treeId.getDatastoreType(), producer);
+            return producer;
         }
+    }
 
-        static class NoopCloseDataProducer implements DOMDataTreeProducer {
-
-            private final DOMDataTreeProducer delegateTreeProducer;
+    private static final class NoopCloseDataProducer implements DOMDataTreeProducer {
+        private final DOMDataTreeProducer delegateTreeProducer;
 
-            NoopCloseDataProducer(final DOMDataTreeProducer delegateTreeProducer) {
-                this.delegateTreeProducer = delegateTreeProducer;
-            }
+        NoopCloseDataProducer(final DOMDataTreeProducer delegateTreeProducer) {
+            this.delegateTreeProducer = delegateTreeProducer;
+        }
 
-            @Override
-            public DOMDataTreeCursorAwareTransaction createTransaction(final boolean isolated) {
-                return delegateTreeProducer.createTransaction(isolated);
-            }
+        @Override
+        public DOMDataTreeCursorAwareTransaction createTransaction(final boolean isolated) {
+            return delegateTreeProducer.createTransaction(isolated);
+        }
 
-            @Override
-            public DOMDataTreeProducer createProducer(final Collection<DOMDataTreeIdentifier> subtrees) {
-                return delegateTreeProducer.createProducer(subtrees);
-            }
+        @Override
+        public DOMDataTreeProducer createProducer(final Collection<DOMDataTreeIdentifier> subtrees) {
+            return delegateTreeProducer.createProducer(subtrees);
+        }
 
-            @Override
-            public void close() throws DOMDataTreeProducerException {
-                // noop
-            }
+        @Override
+        public void close() {
+            // noop
+        }
 
-            public void closeDelegate() {
-                try {
-                    delegateTreeProducer.close();
-                } catch (final DOMDataTreeProducerException e) {
-                    throw new IllegalStateException("Trying to close DOMDataTreeProducer with open transaction", e);
-                }
+        public void closeDelegate() {
+            try {
+                delegateTreeProducer.close();
+            } catch (final DOMDataTreeProducerException e) {
+                throw new IllegalStateException("Trying to close DOMDataTreeProducer with open transaction", e);
             }
         }
     }
-- 
2.36.6