Fix #144 Recreate persistent contexts after mixins

Praqma · Feb 7, 2019 · 126c8a9 · 126c8a9
1 parent 23e9ebd
commit 126c8a9
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/src/main/groovy/togit/ScriptBase.groovy b/src/main/groovy/togit/ScriptBase.groovy
@@ -84,8 +84,9 @@ abstract class ScriptBase extends Script implements Context {
         MigrationManager.instance.source = newSource
 
         // Mix in specific criteria/extraction contexts
-        newSource.addCriteria()
-        newSource.addExtractions()
+        newSource.mixinCriteria()
+        newSource.mixinExtractions()
+        MigrationManager.instance.refreshContexts()
     }
 
     /**

diff --git a/src/main/groovy/togit/migration/MigrationManager.groovy b/src/main/groovy/togit/migration/MigrationManager.groovy
@@ -27,6 +27,10 @@ class MigrationManager {
         source = null
         targets.clear()
         plan = new MigrationPlan()
+        refreshContexts()
+    }
+
+    void refreshContexts() {
         criteriaContext = new CriteriaContext()
         extractionsContext = new ExtractionsContext()
         actionsContext = new ActionsContext()

diff --git a/src/main/groovy/togit/migration/sources/MigrationSource.groovy b/src/main/groovy/togit/migration/sources/MigrationSource.groovy
@@ -35,10 +35,10 @@ trait MigrationSource {
     /**
      * Adds source-specific contexts to the global CriteriaContext
      */
-    abstract void addCriteria()
+    abstract void mixinCriteria()
 
     /**
      * Adds source-specific contexts to the global ExtractionsContext
      */
-    abstract void addExtractions()
+    abstract void mixinExtractions()
 }
diff --git a/src/main/groovy/togit/migration/sources/ccbase/ClearCaseSource.groovy b/src/main/groovy/togit/migration/sources/ccbase/ClearCaseSource.groovy
@@ -63,12 +63,12 @@ class ClearCaseSource implements MigrationSource {
     }
 
     @Override
-    void addCriteria() {
+    void mixinCriteria() {
         CriteriaContext.mixin(ClearCaseCriteriaContext)
     }
 
     @Override
-    void addExtractions() {
+    void mixinExtractions() {
         ExtractionsContext.mixin(ClearCaseExtractionsContext)
     }
 

diff --git a/src/main/groovy/togit/migration/sources/ccucm/CcucmSource.groovy b/src/main/groovy/togit/migration/sources/ccucm/CcucmSource.groovy
@@ -65,12 +65,12 @@ class CcucmSource implements MigrationSource {
     }
 
     @Override
-    void addCriteria() {
+    void mixinCriteria() {
         CriteriaContext.mixin(CcucmCriteriaContext)
     }
 
     @Override
-    void addExtractions() {
+    void mixinExtractions() {
         ExtractionsContext.mixin(CcucmExtractionsContext)
     }
 

diff --git a/src/main/groovy/togit/migration/sources/dummy/DummySource.groovy b/src/main/groovy/togit/migration/sources/dummy/DummySource.groovy
@@ -42,12 +42,12 @@ class DummySource implements MigrationSource {
     }
 
     @Override
-    void addCriteria() {
+    void mixinCriteria() {
         CriteriaContext.mixin(DummyCriteriaContext)
     }
 
     @Override
-    void addExtractions() {
+    void mixinExtractions() {
         ExtractionsContext.mixin(DummyExtractionsContext)
     }
 }