From 89a15d03fdc1fed74eca4b2cbd70de25bba50747 Mon Sep 17 00:00:00 2001
From: Robert Varga <rovarga@cisco.com>
Date: Tue, 25 Oct 2016 16:20:57 +0200
Subject: [PATCH] BUG-7025: Use ParseTreeWalker.DEFAULT

We do not need to instantiate new walkers, as there
is a utility instance available for reuse.

Change-Id: I3fb20fd333f1f133bc2427f9d21ddddd8721b972
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit 8f31398fc04d759e5b7f36d1b2b72a8f3732769d)
---
 .../stmt/rfc6020/YangStatementSourceImpl.java      | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangStatementSourceImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangStatementSourceImpl.java
index e53b855ce4..7644c38488 100644
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangStatementSourceImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangStatementSourceImpl.java
@@ -36,17 +36,15 @@ import org.slf4j.LoggerFactory;
  *
  */
 public final class YangStatementSourceImpl implements StatementStreamSource {
+    private static final Logger LOG = LoggerFactory.getLogger(YangStatementSourceImpl.class);
 
     private YangStatementParserListenerImpl yangStatementModelParser;
     private YangStatementParser.StatementContext statementContext;
-    private ParseTreeWalker walker;
     private String sourceName;
-    private static final Logger LOG = LoggerFactory.getLogger(YangStatementSourceImpl.class);
 
     public YangStatementSourceImpl(final String fileName, final boolean isAbsolute) {
         try {
             statementContext = parseYangSource(loadFile(fileName, isAbsolute));
-            walker = new ParseTreeWalker();
             yangStatementModelParser = new YangStatementParserListenerImpl(sourceName);
         } catch (Exception e) {
             logError(e);
@@ -56,7 +54,6 @@ public final class YangStatementSourceImpl implements StatementStreamSource {
     public YangStatementSourceImpl(final InputStream inputStream) {
         try {
             statementContext = parseYangSource(inputStream);
-            walker = new ParseTreeWalker();
             yangStatementModelParser = new YangStatementParserListenerImpl(sourceName);
         } catch (Exception e) {
             logError(e);
@@ -67,7 +64,6 @@ public final class YangStatementSourceImpl implements StatementStreamSource {
         try {
             this.statementContext = statementContext;
             this.sourceName = identifier.getName();
-            walker = new ParseTreeWalker();
             yangStatementModelParser = new YangStatementParserListenerImpl(sourceName);
         } catch (Exception e) {
             logError(e);
@@ -77,25 +73,25 @@ public final class YangStatementSourceImpl implements StatementStreamSource {
     @Override
     public void writePreLinkage(final StatementWriter writer, final QNameToStatementDefinition stmtDef) {
         yangStatementModelParser.setAttributes(writer, stmtDef);
-        walker.walk(yangStatementModelParser, statementContext);
+        ParseTreeWalker.DEFAULT.walk(yangStatementModelParser, statementContext);
     }
 
     @Override
     public void writeLinkage(final StatementWriter writer, final QNameToStatementDefinition stmtDef, final PrefixToModule preLinkagePrefixes) {
         yangStatementModelParser.setAttributes(writer, stmtDef, preLinkagePrefixes);
-        walker.walk(yangStatementModelParser, statementContext);
+        ParseTreeWalker.DEFAULT.walk(yangStatementModelParser, statementContext);
     }
 
     @Override
     public void writeLinkageAndStatementDefinitions(final StatementWriter writer, final QNameToStatementDefinition stmtDef, final PrefixToModule prefixes) {
         yangStatementModelParser.setAttributes(writer, stmtDef, prefixes);
-        walker.walk(yangStatementModelParser, statementContext);
+        ParseTreeWalker.DEFAULT.walk(yangStatementModelParser, statementContext);
     }
 
     @Override
     public void writeFull(final StatementWriter writer, final QNameToStatementDefinition stmtDef, final PrefixToModule prefixes) {
         yangStatementModelParser.setAttributes(writer, stmtDef, prefixes);
-        walker.walk(yangStatementModelParser, statementContext);
+        ParseTreeWalker.DEFAULT.walk(yangStatementModelParser, statementContext);
     }
 
     private NamedFileInputStream loadFile(final String fileName, final boolean isAbsolute) throws URISyntaxException,
-- 
2.36.6