HONEYCOMB-61: Add context data tree

For storing mapping related context necessary for the plugins
Add naming context adapter to store naming contexts in the data tree

+ Enable persistence for context data tree

Change-Id: I2ac531e80e71a48d313b065997d134da2ae7ee12
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>

1 files changed, 2 insertions, 7 deletions

diff --git a/v3po/vpp-translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/v3po/util/NamingContext.java b/v3po/vpp-translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/v3po/util/NamingContext.java
index 96d908e1b..9affd0695 100644
--- a/v3po/vpp-translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/v3po/util/NamingContext.java
+++ b/v3po/vpp-translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/v3po/util/NamingContext.java
@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
  * Naming context keeping a mapping between int index and string name.
  * Provides artificial names to unknown indices.
  */
-public final class NamingContext implements AutoCloseable {
+public class NamingContext implements AutoCloseable {
 
     private static final Logger LOG = LoggerFactory.getLogger(NamingContext.class);
 
@@ -49,17 +49,14 @@ public final class NamingContext implements AutoCloseable {
         return nameMapping.inverse().get(index);
     }
 
-    @Nonnull
     public synchronized boolean containsName(final int index) {
         return nameMapping.inverse().containsKey(index);
     }
 
-    @Nonnull
     public synchronized void addName(final int index, final String name) {
         nameMapping.put(name, index);
     }
 
-    @Nonnull
     public synchronized int removeName(final String name) {
         return nameMapping.remove(name);
     }
@@ -71,19 +68,17 @@ public final class NamingContext implements AutoCloseable {
      * @return integer index value matching supplied name
      * @throws IllegalArgumentException if name was not found
      */
-    @Nonnull
     public synchronized int getIndex(String name) {
         checkArgument(nameMapping.containsKey(name), "Name %s not found. Known names: %s",
                 name, nameMapping);
         return nameMapping.get(name);
     }
 
-    @Nonnull
     public synchronized boolean containsIndex(String interfaceName) {
         return nameMapping.containsKey(interfaceName);
     }
 
-    public String getArtificialName(final int index) {
+    private String getArtificialName(final int index) {
         return artificialNamePrefix + index;
     }