Remove StmtContext.Mutable.addMutableStmtToSeal()

[yangtools.git] / yang / yang-parser-rfc7950 / src / main / java / org / opendaylight / yangtools / yang / parser / rfc7950 / stmt / extension / ExtensionStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java
index 02786890326c94d5fce28b9f0b4364b532f87c9b..29fec15bb1134049dd1687257c770a91e1ac71cb 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java
@@ -42,12 +42,11 @@ public final class ExtensionStatementSupport
         .addOptional(YangStmtMapping.STATUS)
         .build();
     private static final ExtensionStatementSupport INSTANCE = new ExtensionStatementSupport();
-    // FIXME: YANGTOOLS-1185: use EffectiveStmtCtx.Current as key
-    private static final ThreadLocal<Map<StmtContext<?, ?, ?>, ExtensionEffectiveStatementImpl>> TL_BUILDERS =
+    private static final ThreadLocal<Map<Current<?, ?>, ExtensionEffectiveStatementImpl>> TL_BUILDERS =
             new ThreadLocal<>();
 
     private ExtensionStatementSupport() {
-        super(YangStmtMapping.EXTENSION);
+        super(YangStmtMapping.EXTENSION, CopyPolicy.REJECT);
     }
 
     public static ExtensionStatementSupport getInstance() {
@@ -101,14 +100,13 @@ public final class ExtensionStatementSupport
     public ExtensionEffectiveStatement createEffective(final Current<QName, ExtensionStatement> stmt,
             final Stream<? extends StmtContext<?, ?, ?>> declaredSubstatements,
             final Stream<? extends StmtContext<?, ?, ?>> effectiveSubstatements) {
-        Map<StmtContext<?, ?, ?>, ExtensionEffectiveStatementImpl> tl = TL_BUILDERS.get();
+        Map<Current<?, ?>, ExtensionEffectiveStatementImpl> tl = TL_BUILDERS.get();
         if (tl == null) {
             tl = new IdentityHashMap<>();
             TL_BUILDERS.set(tl);
         }
 
-        final StmtContext<?, ?, ?> ctx = stmt.caerbannog();
-        final ExtensionEffectiveStatementImpl existing = tl.get(ctx);
+        final ExtensionEffectiveStatementImpl existing = tl.get(stmt);
         if (existing != null) {
             // Implies non-empty map, no cleanup necessary
             return existing;
@@ -116,12 +114,12 @@ public final class ExtensionStatementSupport
 
         try {
             final ExtensionEffectiveStatementImpl created = new ExtensionEffectiveStatementImpl(stmt.declared(),
-                stmt.getSchemaPath());
-            verify(tl.put(ctx, created) == null);
+                stmt.wrapSchemaPath());
+            verify(tl.put(stmt, created) == null);
             try {
                 return super.createEffective(stmt, declaredSubstatements, effectiveSubstatements);
             } finally {
-                verify(tl.remove(ctx) == created);
+                verify(tl.remove(stmt) == created);
             }
         } finally {
             if (tl.isEmpty()) {
@@ -134,7 +132,7 @@ public final class ExtensionStatementSupport
     protected ExtensionEffectiveStatement createEffective(final Current<QName, ExtensionStatement> stmt,
             final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
         final ExtensionEffectiveStatementImpl ret = verifyNotNull(verifyNotNull(TL_BUILDERS.get(),
-            "Statement build state not initialized").get(stmt.caerbannog()), "No build state found for %s", stmt);
+            "Statement build state not initialized").get(stmt), "No build state found for %s", stmt);
         ret.setSubstatements(substatements);
         return ret;
     }