Remove DataTreeCandidateNodes.fromNormalizedNode()

This has been replaced by written(), remove it now.

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

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeCandidateNodes.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeCandidateNodes.java
index db37b5869e7eda005d4e931580a9a6176024b325..6b1636572c20c1f780c2c12384fdc5c9fc2b5c8f 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeCandidateNodes.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeCandidateNodes.java
@@ -26,7 +26,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodeContainer;
 @Beta
 public final class DataTreeCandidateNodes {
     private DataTreeCandidateNodes() {
-        throw new UnsupportedOperationException();
+
     }
 
     /**
@@ -39,11 +39,6 @@ public final class DataTreeCandidateNodes {
         return new EmptyDataTreeCandidateNode(identifier);
     }
 
-    @Deprecated
-    public static @NonNull DataTreeCandidateNode fromNormalizedNode(final NormalizedNode<?, ?> node) {
-        return written(node);
-    }
-
     /**
      * Return an unmodified {@link DataTreeCandidateNode} identified by specified {@link NormalizedNode}.
      *
@@ -270,7 +265,7 @@ public final class DataTreeCandidateNodes {
             this.iterator = requireNonNull(iterator);
         }
 
-        AbstractNodeIterator next(final DataTreeModificationCursor cursor) {
+        final AbstractNodeIterator next(final DataTreeModificationCursor cursor) {
             while (iterator.hasNext()) {
                 final DataTreeCandidateNode node = iterator.next();
                 switch (node.getModificationType()) {
@@ -306,24 +301,22 @@ public final class DataTreeCandidateNodes {
     }
 
     private static final class RootNonExitingIterator extends AbstractNodeIterator {
-
         RootNonExitingIterator(final Iterator<DataTreeCandidateNode> iterator) {
             super(iterator);
         }
 
         @Override
-        protected void exitNode(final DataTreeModificationCursor cursor) {
+        void exitNode(final DataTreeModificationCursor cursor) {
             // Intentional noop.
         }
 
         @Override
-        protected AbstractNodeIterator getParent() {
+        AbstractNodeIterator getParent() {
             return null;
         }
     }
 
     private static final class ExitingNodeIterator extends AbstractNodeIterator {
-
         private final AbstractNodeIterator parent;
 
         ExitingNodeIterator(final AbstractNodeIterator parent, final Iterator<DataTreeCandidateNode> iterator) {

diff --git a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeCandidateNodesTest.java b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeCandidateNodesTest.java
index 6123c2d19c49e7dba9108a96d8a7cc5b416c9f7d..056bb950640ecd259a257d50447ad94f81986369 100644 (file)
--- a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeCandidateNodesTest.java
+++ b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeCandidateNodesTest.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.yangtools.yang.data.api.schema.tree;
 
 import static org.junit.Assert.assertNotNull;
@@ -32,8 +31,7 @@ public class DataTreeCandidateNodesTest {
     @Test
     public void testFromNormalizedNode() {
         final NormalizedNode<?, ?> mockedNormalizedNode = mock(NormalizedNode.class);
-        final DataTreeCandidateNode dataTreeCandidateNode = DataTreeCandidateNodes.fromNormalizedNode(
-                mockedNormalizedNode);
+        final DataTreeCandidateNode dataTreeCandidateNode = DataTreeCandidateNodes.written(mockedNormalizedNode);
         assertNotNull(dataTreeCandidateNode);
     }