Rework NormalizedNode type hierarchy

[yangtools.git] / yang / rfc8528-data-util / src / main / java / org / opendaylight / yangtools / rcf8528 / data / util / AbstractDynamicMountPointContextFactory.java

diff --git a/yang/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rcf8528/data/util/AbstractDynamicMountPointContextFactory.java b/yang/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rcf8528/data/util/AbstractDynamicMountPointContextFactory.java
index 0ae083eedf42d68153cec652eab3e3a204881ed9..0f127a5b48fc9e99ca5acc3f60dd8beb41b0711e 100644 (file)
--- a/yang/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rcf8528/data/util/AbstractDynamicMountPointContextFactory.java
+++ b/yang/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rcf8528/data/util/AbstractDynamicMountPointContextFactory.java
@@ -13,7 +13,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.yangtools.concepts.AbstractIdentifiable;
+import org.opendaylight.yangtools.concepts.AbstractSimpleIdentifiable;
 import org.opendaylight.yangtools.rfc8528.data.api.MountPointChild;
 import org.opendaylight.yangtools.rfc8528.data.api.MountPointContext;
 import org.opendaylight.yangtools.rfc8528.data.api.MountPointContextFactory;
@@ -30,8 +30,8 @@ import org.slf4j.LoggerFactory;
  * Abstract base class for dynamic resolvers.
  */
 @Beta
-// FIXME: 6.0.0: consider integrating into AbstractMountPointContextFactory
-public abstract class AbstractDynamicMountPointContextFactory extends AbstractIdentifiable<MountPointIdentifier>
+// FIXME: 7.0.0: consider integrating into AbstractMountPointContextFactory
+public abstract class AbstractDynamicMountPointContextFactory extends AbstractSimpleIdentifiable<MountPointIdentifier>
         implements MountPointContextFactory {
     private static final Logger LOG = LoggerFactory.getLogger(AbstractDynamicMountPointContextFactory.class);
 
@@ -52,7 +52,7 @@ public abstract class AbstractDynamicMountPointContextFactory extends AbstractId
                 continue;
             }
 
-            final NormalizedNode<?, ?> libData;
+            final NormalizedNode libData;
             try {
                 libData = entry.getValue().normalizeTo(optLibContext.get());
             } catch (IOException e) {
@@ -67,7 +67,7 @@ public abstract class AbstractDynamicMountPointContextFactory extends AbstractId
                 return new EmptyMountPointContext(schemaContext);
             }
 
-            final NormalizedNode<?, ?> mountData;
+            final NormalizedNode mountData;
             try {
                 mountData = schemaMounts.normalizeTo(schemaContext);
             } catch (IOException e) {