Related to #144 Summer cleaning before fixing context shenanigans

Praqma · Jul 30, 2018 · ffefbb5 · ffefbb5
1 parent f372a37
commit ffefbb5
Show file tree

Hide file tree

Showing 43 changed files with 115 additions and 268 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,18 +1,21 @@
-# Gradle
+# dev
 .gradle
 build/
 gradle-app.setting
 !gradle-wrapper.jar
 /.nb-gradle/
 
-# IDEA
+bin/
+.project
+.settings
+.classpath
+
+.vscode
+
 .idea/
 *.iml
-
-# Output
 out/
 
-# Jekyll
 _site
 .sass-cache
 
@@ -22,8 +25,3 @@ _site
 # Specific command files
 customers/*
 *.swp
-
-# 2git log files
-2git-[-_0-9]*.log
-logs
-cc2git
diff --git a/build.gradle b/build.gradle
@@ -77,16 +77,3 @@ github {
 
 githubRelease.group = "Publishing"
 githubRelease.description = "Creates a release on GitHub"
-
-// --------------------
-// testing
-// --------------------
-
-task functionalTest(type: Test) {
-    dependsOn('testClasses')
-    include 'toGit/functional/**'
-}
-
-test {
-    exclude 'toGit/functional/**'
-}
diff --git a/src/main/groovy/toGit/ScriptBase.groovy b/src/main/groovy/toGit/ScriptBase.groovy
@@ -1,11 +1,8 @@
 package toGit
 
 import org.slf4j.LoggerFactory
-import toGit.context.MigrationContext
-import toGit.context.base.Context
-import toGit.context.base.DslContext
-import toGit.context.traits.SourceContext
-import toGit.context.traits.TargetContext
+import toGit.context.*
+import toGit.context.*
 import toGit.migration.MigrationManager
 import toGit.migration.sources.MigrationSource
 import toGit.migration.sources.ccbase.context.ClearCaseSourceContext
@@ -71,9 +68,9 @@ abstract class ScriptBase extends Script implements Context {
         if (!sourceTypes.containsKey(type)) throw new Exception("Source '$type' not supported.")
 
         // Initialize and configure the source
-        def sourceContext = sourceTypes[type].newInstance() as SourceContext
-        executeInContext(closure, sourceContext)
-        MigrationSource newSource = sourceContext.source
+        def SourceContext = sourceTypes[type].newInstance()
+        executeInContext(closure, SourceContext)
+        MigrationSource newSource = SourceContext.source
 
         // Set MigrationManager's source
         MigrationManager.instance.source = newSource

diff --git a/src/main/groovy/toGit/context/ActionsContext.groovy b/src/main/groovy/toGit/context/ActionsContext.groovy
@@ -4,16 +4,16 @@ import groovy.text.SimpleTemplateEngine
 import net.praqma.util.execute.CommandLine
 import org.apache.commons.io.FileUtils
 import org.slf4j.LoggerFactory
-import toGit.context.base.Context
-import toGit.context.traits.HasActions
 import toGit.migration.MigrationManager
 import toGit.migration.plan.Action
 import toGit.utils.FileHelper
 
-class ActionsContext implements Context, HasActions {
+class ActionsContext implements Context {
 
     final static log = LoggerFactory.getLogger(this.class)
 
+    final List<Action> actions = []
+
     /**
      * Copies the contents of the source directory to the default target directory.
      */

diff --git a/src/main/groovy/toGit/context/AfterContext.groovy b/src/main/groovy/toGit/context/AfterContext.groovy
@@ -1,8 +1,6 @@
 package toGit.context
 
 import org.slf4j.LoggerFactory
-import toGit.context.base.Context
-import toGit.context.base.DslContext
 import toGit.migration.MigrationManager
 
 import static ContextHelper.executeInContext

diff --git a/src/main/groovy/toGit/context/BeforeContext.groovy b/src/main/groovy/toGit/context/BeforeContext.groovy
@@ -1,8 +1,6 @@
 package toGit.context
 
 import org.slf4j.LoggerFactory
-import toGit.context.base.Context
-import toGit.context.base.DslContext
 import toGit.migration.MigrationManager
 
 import static toGit.context.ContextHelper.executeInContext

diff --git a/src/main/groovy/toGit/context/Context.groovy b/src/main/groovy/toGit/context/Context.groovy
@@ -0,0 +1,3 @@
+package toGit.context
+
+interface Context {}
diff --git a/src/main/groovy/toGit/context/ContextHelper.groovy b/src/main/groovy/toGit/context/ContextHelper.groovy
@@ -1,10 +1,5 @@
 package toGit.context
 
-import toGit.context.base.Context
-import toGit.context.traits.HasActions
-import toGit.context.traits.HasCriteria
-import toGit.context.traits.HasExtractions
-
 class ContextHelper {
     private ContextHelper() {
     }
@@ -19,9 +14,9 @@ class ContextHelper {
         if (closure) {
             //FIXME Workaround for the CEA arrays not being cleared
             //FIXME This is due to contexts being global and no new instances being made
-            if (context instanceof HasCriteria) context.criteria.clear()
-            if (context instanceof HasExtractions) context.extractions.clear()
-            if (context instanceof HasActions) context.actions.clear()
+            if (context instanceof CriteriaContext) context.criteria.clear()
+            if (context instanceof ExtractionsContext) context.extractions.clear()
+            if (context instanceof ActionsContext) context.actions.clear()
 
             closure.delegate = context
             closure.resolveStrategy = Closure.DELEGATE_FIRST

diff --git a/src/main/groovy/toGit/context/CriteriaContext.groovy b/src/main/groovy/toGit/context/CriteriaContext.groovy
@@ -1,15 +1,15 @@
 package toGit.context
 
 import org.slf4j.LoggerFactory
-import toGit.context.base.Context
-import toGit.context.traits.HasCriteria
 import toGit.migration.plan.Criteria
 import toGit.migration.plan.Snapshot
 
-class CriteriaContext implements Context, HasCriteria {
+class CriteriaContext implements Context {
 
     final static log = LoggerFactory.getLogger(this.class)
 
+    final List<Criteria> criteria = []
+
     /**
      * Filters {@link Snapshot}s using a custom Groovy closure
      * @param closure Closure to run

diff --git a/src/main/groovy/toGit/context/DslContext.groovy b/src/main/groovy/toGit/context/DslContext.groovy
@@ -0,0 +1,5 @@
+package toGit.context
+
+@interface DslContext {
+    Class<? extends Context> value()
+}
diff --git a/src/main/groovy/toGit/context/ExtractionsContext.groovy b/src/main/groovy/toGit/context/ExtractionsContext.groovy
@@ -1,15 +1,15 @@
 package toGit.context
 
 import org.slf4j.LoggerFactory
-import toGit.context.base.Context
-import toGit.context.traits.HasExtractions
 import toGit.migration.plan.Extraction
 import toGit.migration.plan.Snapshot
 
-class ExtractionsContext implements Context, HasExtractions {
+class ExtractionsContext implements Context {
 
     final static log = LoggerFactory.getLogger(this.class)
 
+    final List<Extraction> extractions = []
+
     /**
      * Runs a custom closure to map values
      * @param closure Closure to run

diff --git a/src/main/groovy/toGit/context/FilterContext.groovy b/src/main/groovy/toGit/context/FilterContext.groovy
@@ -1,8 +1,6 @@
 package toGit.context
 
 import org.slf4j.LoggerFactory
-import toGit.context.base.Context
-import toGit.context.base.DslContext
 import toGit.migration.MigrationManager
 import toGit.migration.plan.Filter
 

diff --git a/src/main/groovy/toGit/context/FiltersContext.groovy b/src/main/groovy/toGit/context/FiltersContext.groovy
@@ -1,8 +1,6 @@
 package toGit.context
 
 import org.slf4j.LoggerFactory
-import toGit.context.base.Context
-import toGit.context.base.DslContext
 import toGit.migration.plan.Filter
 
 import static ContextHelper.executeInContext

diff --git a/src/main/groovy/toGit/context/MigrationContext.groovy b/src/main/groovy/toGit/context/MigrationContext.groovy
@@ -1,8 +1,6 @@
 package toGit.context
 
 import org.slf4j.LoggerFactory
-import toGit.context.base.Context
-import toGit.context.base.DslContext
 import toGit.migration.MigrationManager
 
 import static ContextHelper.executeInContext

diff --git a/src/main/groovy/toGit/context/SourceContext.groovy b/src/main/groovy/toGit/context/SourceContext.groovy
@@ -0,0 +1,7 @@
+package toGit.context
+
+import toGit.migration.sources.MigrationSource
+
+abstract class SourceContext implements Context {
+    MigrationSource source
+}
diff --git a/src/main/groovy/toGit/context/TargetContext.groovy b/src/main/groovy/toGit/context/TargetContext.groovy
@@ -0,0 +1,7 @@
+package toGit.context
+
+import toGit.migration.targets.MigrationTarget
+
+abstract class TargetContext implements Context {
+    MigrationTarget target
+}
diff --git a/src/main/groovy/toGit/context/base/Context.groovy b/src/main/groovy/toGit/context/base/Context.groovy
diff --git a/src/main/groovy/toGit/context/base/DslContext.groovy b/src/main/groovy/toGit/context/base/DslContext.groovy
diff --git a/src/main/groovy/toGit/context/traits/HasActions.groovy b/src/main/groovy/toGit/context/traits/HasActions.groovy
diff --git a/src/main/groovy/toGit/context/traits/HasCriteria.groovy b/src/main/groovy/toGit/context/traits/HasCriteria.groovy
diff --git a/src/main/groovy/toGit/context/traits/HasExtractions.groovy b/src/main/groovy/toGit/context/traits/HasExtractions.groovy
diff --git a/src/main/groovy/toGit/context/traits/SourceContext.groovy b/src/main/groovy/toGit/context/traits/SourceContext.groovy
diff --git a/src/main/groovy/toGit/context/traits/TargetContext.groovy b/src/main/groovy/toGit/context/traits/TargetContext.groovy
diff --git a/src/main/groovy/toGit/migration/MigrationManager.groovy b/src/main/groovy/toGit/migration/MigrationManager.groovy
@@ -4,7 +4,7 @@ import org.slf4j.LoggerFactory
 import toGit.context.ActionsContext
 import toGit.context.CriteriaContext
 import toGit.context.ExtractionsContext
-import toGit.context.base.Context
+import toGit.context.Context
 import toGit.migration.plan.MigrationPlan
 import toGit.migration.sources.MigrationSource
 import toGit.migration.targets.MigrationTarget

diff --git a/src/main/groovy/toGit/migration/sources/MigrationSource.groovy b/src/main/groovy/toGit/migration/sources/MigrationSource.groovy
@@ -1,6 +1,6 @@
 package toGit.migration.sources
 
-import toGit.context.base.Context
+import toGit.context.Context
 import toGit.migration.plan.Criteria
 import toGit.migration.plan.Snapshot
 

diff --git a/src/main/groovy/toGit/migration/sources/ccbase/ClearCaseSource.groovy b/src/main/groovy/toGit/migration/sources/ccbase/ClearCaseSource.groovy
@@ -1,7 +1,7 @@
 package toGit.migration.sources.ccbase
 
 import org.slf4j.LoggerFactory
-import toGit.context.base.Context
+import toGit.context.Context
 import toGit.migration.plan.Criteria
 import toGit.migration.plan.Snapshot
 import toGit.migration.sources.MigrationSource

diff --git a/src/main/groovy/toGit/migration/sources/ccbase/context/ClearCaseCriteriaContext.groovy b/src/main/groovy/toGit/migration/sources/ccbase/context/ClearCaseCriteriaContext.groovy
@@ -2,7 +2,7 @@ package toGit.migration.sources.ccbase.context
 
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
-import toGit.context.base.Context
+import toGit.context.Context
 import toGit.migration.sources.ccbase.criteria.AfterLabel
 import toGit.migration.sources.ccbase.criteria.LabelName
 

diff --git a/src/main/groovy/toGit/migration/sources/ccbase/context/ClearCaseExtractionsContext.groovy b/src/main/groovy/toGit/migration/sources/ccbase/context/ClearCaseExtractionsContext.groovy
@@ -2,7 +2,7 @@ package toGit.migration.sources.ccbase.context
 
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
-import toGit.context.base.Context
+import toGit.context.Context
 import toGit.migration.sources.ccbase.extractions.LabelExtraction
 
 trait ClearCaseExtractionsContext implements Context {

diff --git a/src/main/groovy/toGit/migration/sources/ccbase/context/ClearCaseSourceContext.groovy b/src/main/groovy/toGit/migration/sources/ccbase/context/ClearCaseSourceContext.groovy
@@ -1,11 +1,10 @@
 package toGit.migration.sources.ccbase.context
 
 import org.slf4j.LoggerFactory
-import toGit.context.base.Context
-import toGit.context.traits.SourceContext
+import toGit.context.SourceContext
 import toGit.migration.sources.ccbase.ClearCaseSource
 
-class ClearCaseSourceContext implements Context, SourceContext {
+class ClearCaseSourceContext extends SourceContext {
     final static log = LoggerFactory.getLogger(this.class)
 
     public ClearCaseSourceContext() {

diff --git a/src/main/groovy/toGit/migration/sources/ccucm/CcucmSource.groovy b/src/main/groovy/toGit/migration/sources/ccucm/CcucmSource.groovy
@@ -7,7 +7,7 @@ import net.praqma.clearcase.ucm.entities.Stream as CoolStream
 import net.praqma.clearcase.ucm.utils.BaselineFilter
 import net.praqma.clearcase.ucm.view.SnapshotView as CoolSnapshotView
 import org.slf4j.LoggerFactory
-import toGit.context.base.Context
+import toGit.context.Context
 import toGit.migration.plan.Criteria
 import toGit.migration.plan.Snapshot
 import toGit.migration.sources.MigrationSource

diff --git a/src/main/groovy/toGit/migration/sources/ccucm/context/CcucmCriteriaContext.groovy b/src/main/groovy/toGit/migration/sources/ccucm/context/CcucmCriteriaContext.groovy
@@ -3,7 +3,7 @@ package toGit.migration.sources.ccucm.context
 import net.praqma.clearcase.ucm.entities.Baseline as CoolBaseline
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
-import toGit.context.base.Context
+import toGit.context.Context
 import toGit.migration.sources.ccucm.criteria.AfterDate
 import toGit.migration.sources.ccucm.criteria.BaselineName
 import toGit.migration.sources.ccucm.criteria.BaselineNames

diff --git a/src/main/groovy/toGit/migration/sources/ccucm/context/CcucmExtractionsContext.groovy b/src/main/groovy/toGit/migration/sources/ccucm/context/CcucmExtractionsContext.groovy
@@ -2,7 +2,7 @@ package toGit.migration.sources.ccucm.context
 
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
-import toGit.context.base.Context
+import toGit.context.Context
 import toGit.migration.sources.ccucm.extractions.BaselineProperty
 
 trait CcucmExtractionsContext implements Context {

diff --git a/src/main/groovy/toGit/migration/sources/ccucm/context/CcucmSourceContext.groovy b/src/main/groovy/toGit/migration/sources/ccucm/context/CcucmSourceContext.groovy
@@ -2,12 +2,11 @@ package toGit.migration.sources.ccucm.context
 
 import net.praqma.clearcase.ucm.view.SnapshotView
 import org.slf4j.LoggerFactory
-import toGit.context.base.Context
-import toGit.context.traits.SourceContext
+import toGit.context.SourceContext
 import toGit.migration.sources.ccucm.CcucmOptions
 import toGit.migration.sources.ccucm.CcucmSource
 
-class CcucmSourceContext implements Context, SourceContext {
+class CcucmSourceContext extends SourceContext {
 
     final static log = LoggerFactory.getLogger(this.class)