Remove JSR305 annotations from yang-data-codec-xml

[yangtools.git] / yang / yang-data-codec-xml / src / main / java / org / opendaylight / yangtools / yang / data / codec / xml / RandomPrefixInstanceIdentifierSerializer.java

diff --git a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/RandomPrefixInstanceIdentifierSerializer.java b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/RandomPrefixInstanceIdentifierSerializer.java
index 5e3a7a46e78253583241e59e7b5ce88ec2e926fe..6a666a0da0257bec3ada701eb74fe4a8cdea5b1e 100644 (file)
--- a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/RandomPrefixInstanceIdentifierSerializer.java
+++ b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/RandomPrefixInstanceIdentifierSerializer.java
@@ -9,19 +9,21 @@ package org.opendaylight.yangtools.yang.data.codec.xml;
 
 import java.net.URI;
 import java.util.Map.Entry;
-import javax.annotation.Nonnull;
+import javax.xml.namespace.NamespaceContext;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.util.AbstractStringInstanceIdentifierCodec;
 import org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
 final class RandomPrefixInstanceIdentifierSerializer extends AbstractStringInstanceIdentifierCodec {
-    private final RandomPrefix prefixes = new RandomPrefix();
-    private final DataSchemaContextTree schemaTree;
+    private final @NonNull DataSchemaContextTree schemaTree;
+    private final RandomPrefix prefixes;
 
-
-    RandomPrefixInstanceIdentifierSerializer(SchemaContext ctx) {
-        schemaTree = DataSchemaContextTree.from(ctx);
+    RandomPrefixInstanceIdentifierSerializer(final @NonNull SchemaContext schemaContext,
+        final NamespaceContext nsContext) {
+        schemaTree = DataSchemaContextTree.from(schemaContext);
+        prefixes = new RandomPrefix(nsContext);
     }
 
     Iterable<Entry<URI, String>> getPrefixes() {
@@ -29,19 +31,17 @@ final class RandomPrefixInstanceIdentifierSerializer extends AbstractStringInsta
     }
 
     @Override
-    protected String prefixForNamespace(@Nonnull final URI namespace) {
+    protected String prefixForNamespace(final URI namespace) {
         return prefixes.encodePrefix(namespace);
     }
 
     @Override
-    protected QName createQName(@Nonnull final String prefix, @Nonnull final String localName) {
+    protected QName createQName(final String prefix, final String localName) {
         throw new UnsupportedOperationException("Not implemented");
     }
 
-    @Nonnull
     @Override
     protected DataSchemaContextTree getDataContextTree() {
         return schemaTree;
     }
-
 }