Skip to content
This repository has been archived by the owner on Dec 22, 2022. It is now read-only.

Refactor/oss package #17

Merged
merged 3 commits into from
Oct 18, 2017
Merged

Refactor/oss package #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38161a2
Moves project into nl.rabobank.oss package
jhkuperus Oct 18, 2017
7640d22
Re-releasing 0.1.0 under new group ID
jhkuperus Oct 18, 2017
516db9b
Bumping to development version
jhkuperus Oct 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/GlossariesController.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package controllers

import javax.inject._

import nl.rabobank.rules.facts.Fact
import nl.rabobank.oss.rules.facts.Fact
import play.api.libs.functional.syntax._
import play.api.libs.json._
import play.api.mvc._
Expand Down
6 changes: 3 additions & 3 deletions app/controllers/RestController.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import javax.inject.Inject

import controllers.conversion._
import controllers.conversion.Converter._
import nl.rabobank.rules.engine.{Context, FactEngine}
import nl.rabobank.rules.facts.Fact
import nl.rabobank.rules.service.dsl.BusinessService
import nl.rabobank.oss.rules.engine.{Context, FactEngine}
import nl.rabobank.oss.rules.facts.Fact
import nl.rabobank.oss.rules.service.dsl.BusinessService
import play.api.data.validation.ValidationError
import play.api.libs.json._
import play.api.mvc.{Action, Controller, Request, Result}
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/RulesRunner.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package controllers

import nl.rabobank.rules.derivations.Derivation
import nl.rabobank.rules.engine._
import nl.rabobank.oss.rules.derivations.Derivation
import nl.rabobank.oss.rules.engine._

object RulesRunner {
def run(context: Context, derivations: List[Derivation]): Context = FactEngine.runNormalDerivations(context, derivations)
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/conversion/Conversion.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package controllers.conversion

import controllers.conversion.ImplicitConversions._
import nl.rabobank.rules.facts.Fact
import nl.rabobank.rules.finance.nl._
import nl.rabobank.oss.rules.facts.Fact
import nl.rabobank.oss.rules.finance.nl._
import play.api.data.validation.ValidationError
import play.api.libs.json.{JsObject, _}

Expand Down
4 changes: 2 additions & 2 deletions app/controllers/conversion/Converter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package controllers.conversion

import controllers.conversion.ImplicitConversions.contextReads._
import controllers.conversion.ImplicitConversions.contextWrites._
import nl.rabobank.rules.engine._
import nl.rabobank.rules.facts.Fact
import nl.rabobank.oss.rules.engine._
import nl.rabobank.oss.rules.facts.Fact
import play.api.data.validation.ValidationError
import play.api.libs.json._

Expand Down
6 changes: 3 additions & 3 deletions app/controllers/conversion/ImplicitConversions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package controllers.conversion

import nl.rabobank.rules.engine.Context
import nl.rabobank.rules.facts.Fact
import nl.rabobank.rules.finance.nl._
import nl.rabobank.oss.rules.engine.Context
import nl.rabobank.oss.rules.facts.Fact
import nl.rabobank.oss.rules.finance.nl._
import play.api.data.validation.ValidationError
import play.api.libs.json._

Expand Down
4 changes: 2 additions & 2 deletions app/controllers/conversion/JsResponse.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package controllers.conversion

import controllers.conversion.Converter._
import nl.rabobank.rules.engine._
import nl.rabobank.rules.facts.Fact
import nl.rabobank.oss.rules.engine._
import nl.rabobank.oss.rules.facts.Fact
import play.api.libs.json.JsObject

trait ResponseJsObject {
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/conversion/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package controllers

import nl.rabobank.rules.facts.Fact
import nl.rabobank.oss.rules.facts.Fact
import play.api.libs.json.{JsObject, JsResult, JsValue}

package object conversion {
Expand Down
2 changes: 1 addition & 1 deletion app/services/BusinessServicesService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package services

import javax.inject.{Inject, Singleton}

import nl.rabobank.rules.service.dsl.BusinessService
import nl.rabobank.oss.rules.service.dsl.BusinessService
import play.api.Configuration

@Singleton
Expand Down
4 changes: 2 additions & 2 deletions app/services/DerivationsService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package services

import javax.inject.{Inject, Singleton}

import nl.rabobank.rules.derivations.Derivation
import nl.rabobank.rules.dsl.nl.grammar.ElementBerekening
import nl.rabobank.oss.rules.derivations.Derivation
import nl.rabobank.oss.rules.dsl.nl.grammar.ElementBerekening
import play.api.{Configuration, Logger}

@Singleton
Expand Down
4 changes: 2 additions & 2 deletions app/services/GlossariesService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package services

import javax.inject.{Inject, Singleton}

import nl.rabobank.rules.dsl.core.glossaries.Glossary
import nl.rabobank.rules.facts.Fact
import nl.rabobank.oss.rules.dsl.core.glossaries.Glossary
import nl.rabobank.oss.rules.facts.Fact
import play.api.{Configuration, Logger}

@Singleton
Expand Down
6 changes: 3 additions & 3 deletions app/services/JarLoaderService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import java.util.jar.{JarEntry, JarFile}
import javax.inject.{Inject, Singleton}

import controllers.conversion.JsonConversionsProvider
import nl.rabobank.rules.dsl.core.glossaries.Glossary
import nl.rabobank.rules.dsl.nl.grammar.Berekening
import nl.rabobank.rules.service.dsl.BusinessService
import nl.rabobank.oss.rules.dsl.core.glossaries.Glossary
import nl.rabobank.oss.rules.dsl.nl.grammar.Berekening
import nl.rabobank.oss.rules.service.dsl.BusinessService
import play.api.Configuration

import scala.collection.JavaConverters._
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
useGpg := false

lazy val commonSettings = Seq(
organization := "nl.rabobank.rules",
organization := "nl.rabobank.oss.rules",
organizationHomepage := Some(url("https://github.com/rabobank-nederland")),
homepage := Some(url("https://github.com/rabobank-nederland/rule-rest")),
version := "0.1.1-SNAPSHOT",
Expand Down Expand Up @@ -35,7 +35,7 @@ lazy val jodaTimeVersion = "2.4"
lazy val jodaConvertVersion = "1.8"

lazy val dependencies = Seq(
"nl.rabobank.rules" %% "rule-engine" % raboRulesVersion,
"nl.rabobank.oss.rules" %% "rule-engine" % raboRulesVersion,
"joda-time" % "joda-time" % jodaTimeVersion,
"org.joda" % "joda-convert" % jodaConvertVersion,
"org.scalatest" %% "scalatest" % scalaTestVersion % Test,
Expand Down