Rework NormalizedNode type hierarchy

[yangtools.git] / yang / yang-data-transform / src / main / java / org / opendaylight / yangtools / transform / NormalizedNodeTransformations.java

diff --git a/yang/yang-data-transform/src/main/java/org/opendaylight/yangtools/transform/NormalizedNodeTransformations.java b/yang/yang-data-transform/src/main/java/org/opendaylight/yangtools/transform/NormalizedNodeTransformations.java
index aa782789bffef977020c3259354b36a5188abfa6..e7b1a7413f3deb2e6cf3fee723b7e60c44cdb12b 100644 (file)
--- a/yang/yang-data-transform/src/main/java/org/opendaylight/yangtools/transform/NormalizedNodeTransformations.java
+++ b/yang/yang-data-transform/src/main/java/org/opendaylight/yangtools/transform/NormalizedNodeTransformations.java
@@ -11,7 +11,7 @@ import com.google.common.annotations.Beta;
 import java.io.IOException;
 import java.util.Map;
 import java.util.function.Function;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
@@ -22,12 +22,11 @@ import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult;
 
 @Beta
 public final class NormalizedNodeTransformations {
-
     private NormalizedNodeTransformations() {
-        throw new UnsupportedOperationException("Utility class.");
+        // Hidden on purpose
     }
 
-    public static NormalizedNode<?, ?> transformQNames(final NormalizedNode<?, ?> original,
+    public static NormalizedNode transformQNames(final NormalizedNode original,
             final Function<QName, QName> mapping) {
         NormalizedNodeResult result = new NormalizedNodeResult();
         NormalizedNodeStreamWriter nodeWriter = ImmutableNormalizedNodeStreamWriter.from(result);
@@ -47,8 +46,8 @@ public final class NormalizedNodeTransformations {
      * @param mapping Map of QNames to transform. Not listed QNames are preserved.
      * @return Normalized Node with replaced QNames.
      */
-    public static NormalizedNode<?, ?> replaceQNames(@Nonnull final NormalizedNode<?, ?> original,
-            @Nonnull final Map<QName, QName> mapping) {
+    public static NormalizedNode replaceQNames(final @NonNull NormalizedNode original,
+            final @NonNull Map<QName, QName> mapping) {
         return transformQNames(original, new QNameReplacementFunction(mapping));
     }
 
@@ -59,8 +58,8 @@ public final class NormalizedNodeTransformations {
      * @param mapping Map of QNameModules to transform. Not listed QNameModules are preserved.
      * @return Normalized Node with replaced QNameModules.
      */
-    public static NormalizedNode<?, ?> replaceQNameModules(@Nonnull final NormalizedNode<?, ?> original,
-            @Nonnull final Map<QNameModule, QNameModule> mapping) {
+    public static NormalizedNode replaceQNameModules(final @NonNull NormalizedNode original,
+            final @NonNull Map<QNameModule, QNameModule> mapping) {
         return transformQNames(original, new QNameModuleReplacementFunction(mapping));
     }
 }