Moved some remaining parts to derivations package

scala-rules · Nov 4, 2016 · 20d1d44 · 20d1d44
1 parent 75ea542
commit 20d1d44
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 23 deletions.
diff --git a/engine-core/src/main/scala/org/scalarules/derivations/DerivationGraph.scala b/engine-core/src/main/scala/org/scalarules/derivations/DerivationGraph.scala
@@ -1,7 +1,5 @@
 package org.scalarules.derivations
 
-import org.scalarules.engine.Derivation
-
 trait DerivationGraph {
 
 }

diff --git a/engine-core/src/main/scala/org/scalarules/derivations/Derivations.scala b/engine-core/src/main/scala/org/scalarules/derivations/Derivations.scala
@@ -1,6 +1,6 @@
 package org.scalarules.derivations
 
-import org.scalarules.engine.DerivationTools._
+import DerivationTools._
 import org.scalarules.engine._
 import org.scalarules.facts.{Fact, OriginFact}
 

diff --git a/...a/org/scalarules/engine/derivations.scala → .../scalarules/derivations/derivations.scala b/...a/org/scalarules/engine/derivations.scala → .../scalarules/derivations/derivations.scala
@@ -1,11 +1,13 @@
-package org.scalarules.engine
+package org.scalarules.derivations
 
 // TODO : Turn this off and fix it
-import scala.language.existentials
-import DerivationTools._
+import org.scalarules.derivations.DerivationTools._
+import org.scalarules.engine._
 import org.scalarules.facts.Fact
 import org.scalarules.utils.{SourcePosition, SourceUnknown}
 
+import scala.language.existentials
+
 /**
   * A `Derivation` models the basic element used inside the `Engine`. One execution step of the `Engine` will always
   * relate to a single `Derivation`. It defines the `Input`s required for it to be 'ready' as well  the `Fact` under

diff --git a/engine-core/src/main/scala/org/scalarules/engine/FactEngine.scala b/engine-core/src/main/scala/org/scalarules/engine/FactEngine.scala
@@ -1,6 +1,6 @@
 package org.scalarules.engine
 
-import org.scalarules.derivations.Derivations
+import org.scalarules.derivations._
 
 import scala.util.{Failure, Success, Try}
 

diff --git a/engine-core/src/main/scala/org/scalarules/engine/metadata.scala b/engine-core/src/main/scala/org/scalarules/engine/metadata.scala
@@ -1,4 +1,6 @@
 package org.scalarules.engine
 
+import org.scalarules.derivations.Derivation
+
 case class Step(initial: Context, derivation: Derivation, status: String, result: Context)
 
diff --git a/engine-core/src/main/scala/org/scalarules/utils/PrettyPrinter.scala b/engine-core/src/main/scala/org/scalarules/utils/PrettyPrinter.scala
@@ -1,9 +1,10 @@
 package org.scalarules.utils
 
+import org.scalarules.derivations.{DefaultDerivation, Derivation, SubRunDerivation}
 import org.scalarules.engine._
 
 import scala.annotation.tailrec
-import org.scalarules.engine.DerivationTools._
+import org.scalarules.derivations.DerivationTools._
 import org.scalarules.facts.Fact
 
 object PrettyPrinter {

diff --git a/engine-core/src/test/scala/org/scalarules/engine/FactEngineTest.scala b/engine-core/src/test/scala/org/scalarules/engine/FactEngineTest.scala
@@ -4,16 +4,15 @@ import org.scalacheck.{Arbitrary, Gen}
 import org.scalarules.engine.FactEngineTestGlossary._
 import org.scalatest.prop.GeneratorDrivenPropertyChecks
 import org.scalatest.{FlatSpec, Matchers}
-import DerivationTools._
-import org.scalarules.derivations.{Derivations, Node}
+import org.scalarules.derivations._
 import org.scalarules.facts.Fact
 
 class FactEngineTestComputeInputs extends FlatSpec with Matchers {
 
   val derivations = List(FactEngineTestValues.derivationOne, FactEngineTestValues.derivationTwo, FactEngineTestValues.derivationRedefiningOutput)
 
   it should "output all unique inputs" in {
-    val resultingInputs: Set[Fact[Any]] = computeAllInputs(derivations)
+    val resultingInputs: Set[Fact[Any]] = DerivationTools.computeAllInputs(derivations)
 
     resultingInputs should have size 5
     resultingInputs should contain (PurchaseAmount)
@@ -31,7 +30,7 @@ class FactEngineTestComputeOutputs extends FlatSpec with Matchers {
   val derivationsNOK = List(FactEngineTestValues.derivationOne, FactEngineTestValues.derivationTwo, FactEngineTestValues.derivationRedefiningOutput)
 
   it should "output all outputs" in {
-    val resultingOutputs: Set[Fact[Any]] = computeAllOutputs(derivationsOK)
+    val resultingOutputs: Set[Fact[Any]] = DerivationTools.computeAllOutputs(derivationsOK)
 
     resultingOutputs should have size 2
     resultingOutputs should contain (BuildingValue)
@@ -40,7 +39,7 @@ class FactEngineTestComputeOutputs extends FlatSpec with Matchers {
 
   it should "detect a doubly defined output and break" in {
     intercept[IllegalStateException] {
-      computeAllOutputs(derivationsNOK)
+      DerivationTools.computeAllOutputs(derivationsNOK)
     }
   }
 

diff --git a/engine-core/src/test/scala/org/scalarules/engine/SubRunDerivationTest.scala b/engine-core/src/test/scala/org/scalarules/engine/SubRunDerivationTest.scala
@@ -1,5 +1,6 @@
 package org.scalarules.engine
 
+import org.scalarules.derivations.{DefaultDerivation, SubRunData, SubRunDerivation}
 import org.scalarules.facts.{ListFact, SingularFact}
 import org.scalatest.{FlatSpec, Matchers}
 

diff --git a/engine-test-utils/src/main/scala/org/scalarules/testutils/TestUtils.scala b/engine-test-utils/src/main/scala/org/scalarules/testutils/TestUtils.scala
@@ -1,6 +1,7 @@
 package org.scalarules.testutils.nl
 
-import org.scalarules.engine.{Derivation, FactEngine, Step, _}
+import org.scalarules.derivations.Derivation
+import org.scalarules.engine.{FactEngine, Step, _}
 import org.scalarules.facts.Fact
 import org.scalarules.services.{AnalyzedScenario, HeuristicService}
 import org.scalarules.utils.PrettyPrinter

diff --git a/engine/src/main/scala/org/scalarules/dsl/nl/grammar/Berekening.scala b/engine/src/main/scala/org/scalarules/dsl/nl/grammar/Berekening.scala
@@ -1,6 +1,6 @@
 package org.scalarules.dsl.nl.grammar
 
-import org.scalarules.engine.Derivation
+import org.scalarules.derivations.Derivation
 
 class Berekening(berekeningAccumulators: BerekeningAccumulator*) {
   val berekeningen: List[Derivation] = berekeningAccumulators.flatMap(_.derivations).toList

diff --git a/engine/src/main/scala/org/scalarules/dsl/nl/grammar/BerekeningFlow.scala b/engine/src/main/scala/org/scalarules/dsl/nl/grammar/BerekeningFlow.scala
@@ -1,13 +1,11 @@
 package org.scalarules.dsl.nl.grammar
 
-import DslCondition.{andCombineConditions, factFilledCondition}
+import org.scalarules.derivations.{DefaultDerivation, Derivation, SubRunData, SubRunDerivation}
+import org.scalarules.dsl.nl.grammar.DslCondition.{andCombineConditions, factFilledCondition}
 import org.scalarules.dsl.nl.grammar.`macro`.DslMacros
-import org.scalarules.engine._
 import org.scalarules.facts.{Fact, ListFact, SingularFact}
 import org.scalarules.utils.{FileSourcePosition, SourcePosition, SourceUnknown}
 
-import scala.annotation.compileTimeOnly
-import scala.reflect.macros.blackbox.Context
 import scala.language.experimental.macros
 
 //scalastyle:off method.name

diff --git a/engine/src/main/scala/org/scalarules/dsl/nl/grammar/DslLoop.scala b/engine/src/main/scala/org/scalarules/dsl/nl/grammar/DslLoop.scala
@@ -2,6 +2,7 @@ package org.scalarules.dsl.nl.grammar
 
 import java.util.concurrent.atomic.AtomicLong
 
+import org.scalarules.derivations.{DefaultDerivation, SubRunData, SubRunDerivation}
 import org.scalarules.dsl.nl.grammar.DslCondition.factFilledCondition
 import org.scalarules.engine._
 import org.scalarules.facts.{Fact, ListFact, SingularFact}

diff --git a/engine/src/main/scala/org/scalarules/dsl/nl/grammar/DslOrderedListAggregator.scala b/engine/src/main/scala/org/scalarules/dsl/nl/grammar/DslOrderedListAggregator.scala
@@ -1,6 +1,6 @@
 package org.scalarules.dsl.nl.grammar
 
-import org.scalarules.engine.{Derivation, Evaluation}
+import org.scalarules.engine.Evaluation
 
 trait DslOrderedListAggregator {
   private[grammar] def toEvaluation[A : Ordering](listEvaluation: Evaluation[List[A]]): Evaluation[A]

diff --git a/engine/src/main/scala/org/scalarules/dsl/nl/grammar/DslTableSelector.scala b/engine/src/main/scala/org/scalarules/dsl/nl/grammar/DslTableSelector.scala
@@ -1,7 +1,7 @@
 package org.scalarules.dsl.nl.grammar
 
 import DslCondition._
-import org.scalarules.engine.{Context, Derivation, Evaluation}
+import org.scalarules.engine.{Context, Evaluation}
 import org.scalarules.facts.Fact
 
 object DslTableSelector {

diff --git a/engine/src/main/scala/org/scalarules/dsl/nl/grammar/macro/DslMacros.scala b/engine/src/main/scala/org/scalarules/dsl/nl/grammar/macro/DslMacros.scala
@@ -1,7 +1,7 @@
 package org.scalarules.dsl.nl.grammar.`macro`
 
+import org.scalarules.derivations.Derivation
 import org.scalarules.dsl.nl.grammar.{DslCondition, GegevenWord, ListBerekenStart, SingularBerekenStart}
-import org.scalarules.engine.Derivation
 import org.scalarules.facts.{ListFact, SingularFact}
 import org.scalarules.utils.FileSourcePosition
 

diff --git a/engine/src/test/scala/org/scalarules/utils/InternalTestUtils.scala b/engine/src/test/scala/org/scalarules/utils/InternalTestUtils.scala
@@ -1,6 +1,7 @@
 package org.scalarules.utils
 
-import org.scalarules.engine.{Derivation, FactEngine, Step, _}
+import org.scalarules.derivations.Derivation
+import org.scalarules.engine.{FactEngine, Step, _}
 import org.scalarules.facts.Fact
 import org.scalarules.services.{AnalyzedScenario, HeuristicService}