Rename NamespaceStorageSupport

NamespaceStorageSupport is a rather misleading name -- this actually is
an abstract implementation of NamespaceStorage. Rename it to
AbstractNamespaceStorage.

JIRA: YANGTOOLS-1500
Change-Id: I24b7bac34a116e72671d5cb447673a6b13de57ba
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/NamespaceStorageSupport.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/AbstractNamespaceStorage.java
similarity index 96%
rename from parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/NamespaceStorageSupport.java
rename to parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/AbstractNamespaceStorage.java
index 0f2da23acf9520726eade274c9d8c263b777bb81..595831a7b193eef44cb49dc4b5305fb60bd27b02 100644 (file)
--- a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/NamespaceStorageSupport.java
+++ b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/AbstractNamespaceStorage.java
@@ -22,8 +22,8 @@ import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-abstract class NamespaceStorageSupport implements NamespaceStorage {
-    private static final Logger LOG = LoggerFactory.getLogger(NamespaceStorageSupport.class);
+abstract class AbstractNamespaceStorage implements NamespaceStorage {
+    private static final Logger LOG = LoggerFactory.getLogger(AbstractNamespaceStorage.class);
 
     private Map<ParserNamespace<?, ?>, Map<?, ?>> namespaces = ImmutableMap.of();
 
@@ -32,7 +32,7 @@ abstract class NamespaceStorageSupport implements NamespaceStorage {
      *
      * <p>
      * This method override provides bimorphic invocation on this method invocation between
-     * {@link SourceSpecificContext} and the more general {@link NamespaceStorageSupport}. We typically do not expect
+     * {@link SourceSpecificContext} and the more general {@link AbstractNamespaceStorage}. We typically do not expect
      * the two accesses to overlap.
      */
     @Override

diff --git a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.java
index 6f68a34c1f42cf666ea09b857101eae8f9aa6e14..c8cdf662c634f375c1317ae3ddf99e619b31dd4b 100644 (file)
--- a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.java
+++ b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.java
@@ -60,7 +60,7 @@ import org.opendaylight.yangtools.yang.parser.stmt.reactor.SourceSpecificContext
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-final class BuildGlobalContext extends NamespaceStorageSupport {
+final class BuildGlobalContext extends AbstractNamespaceStorage {
     private static final Logger LOG = LoggerFactory.getLogger(BuildGlobalContext.class);
 
     private static final ModelProcessingPhase[] PHASE_EXECUTION_ORDER = {

diff --git a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java
index e60428f18feb29453b8b43f0499ec12e4ce3cba1..ac7eaee409441dc2554a1d0de5436681465a4f5e 100644 (file)
--- a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java
+++ b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
  * @param <E> Effective Statement representation
  */
 abstract class ReactorStmtCtx<A, D extends DeclaredStatement<A>, E extends EffectiveStatement<A, D>>
-        extends NamespaceStorageSupport implements Mutable<A, D, E>, Current<A, D> {
+        extends AbstractNamespaceStorage implements Mutable<A, D, E>, Current<A, D> {
     private static final Logger LOG = LoggerFactory.getLogger(ReactorStmtCtx.class);
 
     /**
@@ -309,7 +309,7 @@ abstract class ReactorStmtCtx<A, D extends DeclaredStatement<A>, E extends Effec
 
     //
     //
-    // NamespaceStorageSupport/Mutable integration methods. Keep these together.
+    // AbstractNamespaceStorage/Mutable integration methods. Keep these together.
     //
     //
 

diff --git a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SweptNamespace.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SweptNamespace.java
index 2054ee75b587a39b7ad62911493493c3a15fec79..d5a7a069713938a4e1e544fe6a409cb3a27bcbb0 100644 (file)
--- a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SweptNamespace.java
+++ b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SweptNamespace.java
@@ -16,7 +16,7 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.ParserNamespace;
 
 /**
  * Placeholder namespace map which does not allow access and acts as a sentinel for namespaces which have been
- * explicitly removed from {@link NamespaceStorageSupport}.
+ * explicitly removed from {@link AbstractNamespaceStorage}.
  */
 final class SweptNamespace extends AbstractMap<Object, Object> {
     private final ParserNamespace<?, ?> name;