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 da808c4f3e4aa461c4f7e5e0a37e17feb0cca4e3..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
@@ -8,11 +8,10 @@
 package org.opendaylight.yangtools.transform;
 
 import com.google.common.annotations.Beta;
-import com.google.common.base.Throwables;
 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;
@@ -23,12 +22,12 @@ 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(NormalizedNode<?, ?> original, Function<QName, QName> mapping) {
+    public static NormalizedNode transformQNames(final NormalizedNode original,
+            final Function<QName, QName> mapping) {
         NormalizedNodeResult result = new NormalizedNodeResult();
         NormalizedNodeStreamWriter nodeWriter = ImmutableNormalizedNodeStreamWriter.from(result);
         NormalizedNodeStreamWriter transformWriter = QNameTransformingStreamWriter.fromFunction(nodeWriter, mapping);
@@ -36,7 +35,7 @@ public final class NormalizedNodeTransformations {
             NormalizedNodeWriter.forStreamWriter(transformWriter).write(original);
             return result.getResult();
         } catch (IOException e) {
-            throw Throwables.propagate(e);
+            throw new RuntimeException(e);
         }
     }
 
@@ -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 NormalizedNode<?, ?> original,
-            @Nonnull 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 NormalizedNode<?, ?> original,
-            @Nonnull Map<QNameModule, QNameModule> mapping) {
+    public static NormalizedNode replaceQNameModules(final @NonNull NormalizedNode original,
+            final @NonNull Map<QNameModule, QNameModule> mapping) {
         return transformQNames(original, new QNameModuleReplacementFunction(mapping));
     }
 }