Fixup collections return implementations

[yangtools.git] / yang / yang-parser-rfc7950 / src / main / java / org / opendaylight / yangtools / yang / parser / rfc7950 / repo / YinStatementStreamSource.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YinStatementStreamSource.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YinStatementStreamSource.java
index 9e2529ae5c7fd0483c768edb3c1185615a653267..88055adcf1306408e2b2e1777c87a24ded1c7aae 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YinStatementStreamSource.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YinStatementStreamSource.java
@@ -12,7 +12,6 @@ import static java.util.Objects.requireNonNull;
 import static org.opendaylight.yangtools.yang.parser.rfc7950.repo.StatementSourceReferenceHandler.extractRef;
 
 import com.google.common.annotations.Beta;
-import com.google.common.base.MoreObjects;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
@@ -20,6 +19,7 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Optional;
 import javax.xml.transform.TransformerException;
+import org.opendaylight.yangtools.concepts.AbstractSimpleIdentifiable;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.YangVersion;
 import org.opendaylight.yangtools.yang.model.api.meta.ArgumentDefinition;
@@ -50,7 +50,8 @@ import org.w3c.dom.NodeList;
  * @author Robert Varga
  */
 @Beta
-public final class YinStatementStreamSource implements StatementStreamSource {
+public final class YinStatementStreamSource extends AbstractSimpleIdentifiable<SourceIdentifier>
+        implements StatementStreamSource {
     private static final Logger LOG = LoggerFactory.getLogger(YinStatementStreamSource.class);
     private static final LoadingCache<String, URI> URI_CACHE = CacheBuilder.newBuilder().weakValues().build(
         new CacheLoader<String, URI>() {
@@ -59,11 +60,10 @@ public final class YinStatementStreamSource implements StatementStreamSource {
                 return new URI(key);
             }
         });
-    private final SourceIdentifier identifier;
     private final Node root;
 
     private YinStatementStreamSource(final SourceIdentifier identifier, final Node root) {
-        this.identifier = requireNonNull(identifier);
+        super(identifier);
         this.root = requireNonNull(root);
     }
 
@@ -75,11 +75,6 @@ public final class YinStatementStreamSource implements StatementStreamSource {
         return new YinStatementStreamSource(source.getIdentifier(), source.getSource().getNode());
     }
 
-    @Override
-    public SourceIdentifier getIdentifier() {
-        return identifier;
-    }
-
     private static StatementDefinition getValidDefinition(final Node node, final StatementWriter writer,
             final QNameToStatementDefinition stmtDef, final StatementSourceReference ref) {
         final URI uri = URI_CACHE.getUnchecked(node.getNamespaceURI());
@@ -256,9 +251,4 @@ public final class YinStatementStreamSource implements StatementStreamSource {
             final PrefixToModule prefixes, final YangVersion yangVersion) {
         walkTree(writer, stmtDef);
     }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this).add("identifier", getIdentifier()).toString();
-    }
 }