Merge pull request #51 from delphi-hub/feature/migration-to-core

Feature/migration to core

Author: bhermann

build.sbt

@@ -27,6 +27,7 @@ libraryDependencies ++= Seq(
   "com.sksamuel.elastic4s" %% "elastic4s-http-streams" % elastic4sVersion,
 )
 
+libraryDependencies += "de.upb.cs.swt.delphi" %% "delphi-core" % "0.9.0"
 
 libraryDependencies += "com.pauldijou" %% "jwt-core" % "4.2.0"
 

src/main/scala/de/upb/cs/swt/delphi/webapi/DelphiRoutes.scala

@@ -23,11 +23,11 @@ import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server.Route
 import akka.pattern.ask
 import akka.stream.scaladsl.Source
+import de.upb.cs.swt.delphi.core.model.ArtifactJson._
+import de.upb.cs.swt.delphi.webapi.FeatureJson._
 import de.upb.cs.swt.delphi.webapi.IpLogActor._
 import de.upb.cs.swt.delphi.webapi.StatisticsJson._
-import de.upb.cs.swt.delphi.webapi.artifacts.ArtifactJson._
 import de.upb.cs.swt.delphi.webapi.search.QueryRequestJson._
-import de.upb.cs.swt.delphi.webapi.FeatureJson._
 import de.upb.cs.swt.delphi.webapi.search.{QueryRequest, SearchError, SearchQuery}
 import spray.json._
 

src/main/scala/de/upb/cs/swt/delphi/webapi/MavenIdentifier.scala

@@ -19,7 +19,8 @@ package de.upb.cs.swt.delphi.webapi
 import com.sksamuel.elastic4s.http.ElasticDsl._
 import com.sksamuel.elastic4s.http.get.GetResponse
 import com.sksamuel.elastic4s.http.{ElasticClient, RequestSuccess, Response}
-import de.upb.cs.swt.delphi.webapi.artifacts.{Artifact, ArtifactTransformer}
+import de.upb.cs.swt.delphi.core.model._
+import de.upb.cs.swt.delphi.webapi.artifacts.ArtifactTransformer
 
 object RetrieveQuery {
 

src/main/scala/de/upb/cs/swt/delphi/webapi/RetrieveQuery.scala

@@ -17,12 +17,12 @@
 package de.upb.cs.swt.delphi.webapi.artifacts
 
 import com.sksamuel.elastic4s.http.search.{SearchHit, SearchHits}
+import de.upb.cs.swt.delphi.core.model._
 import de.upb.cs.swt.delphi.webapi.InternalFeature
 import org.joda.time.format.ISODateTimeFormat
 import spray.json.JsArray
 
 import scala.io.Source
-
 import spray.json._
 import de.upb.cs.swt.delphi.webapi.FeatureJson._
 

src/main/scala/de/upb/cs/swt/delphi/webapi/artifacts/Artifact.scala

@@ -20,14 +20,14 @@ import com.sksamuel.elastic4s.http.ElasticDsl._
 import com.sksamuel.elastic4s.http.search.SearchHits
 import com.sksamuel.elastic4s.http.{ElasticClient, RequestFailure, RequestSuccess}
 import com.sksamuel.elastic4s.searches.queries.{NoopQuery, Query}
-import de.upb.cs.swt.delphi.webapi.artifacts.{Artifact, ArtifactTransformer}
-import de.upb.cs.swt.delphi.webapi.search.querylanguage._
+import de.upb.cs.swt.delphi.core.model._
+import de.upb.cs.swt.delphi.core.ql._
+import de.upb.cs.swt.delphi.webapi.artifacts.ArtifactTransformer
 import de.upb.cs.swt.delphi.webapi.{Configuration, Feature, FeatureQuery, InternalFeature}
 import spray.json.JsArray
 
 import scala.io.Source
 import scala.util.{Failure, Success, Try}
-
 import spray.json._
 import de.upb.cs.swt.delphi.webapi.FeatureJson._