Merge remote-tracking branch 'origin/develop' into feature/4/scalastyle

# Conflicts:
#	build.sbt
#	project/plugins.sbt

Author: bhermann

.travis.yml

@@ -1,3 +1,8 @@
 language: scala
 scala:
-  -  2.12.4
+  -  2.12.4
+script:
+  - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then sbt ++$TRAVIS_SCALA_VERSION test; fi'
+  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt ++$TRAVIS_SCALA_VERSION coverage test coverageReport coverageAggregate codacyCoverage; fi'
+after_success:
+  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash <(curl -s https://codecov.io/bash); fi'

LICENSE

@@ -175,18 +175,7 @@
 
    END OF TERMS AND CONDITIONS
 
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2018 The Delphi Team (represented by Ben Hermann)
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

build.sbt

@@ -9,8 +9,11 @@ libraryDependencies += "com.typesafe.akka" %% "akka-http" % "10.0.11"
 libraryDependencies += "com.typesafe.akka" %% "akka-stream" % "2.5.12"
 libraryDependencies += "com.typesafe.akka" %% "akka-http-spray-json" % "10.1.1"
 libraryDependencies += "io.spray" %%  "spray-json" % "1.3.3"
+libraryDependencies += "org.parboiled" %% "parboiled" % "2.1.4"
+libraryDependencies += "org.scalactic" %% "scalactic" % "3.0.4"
+libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.4" % "test"
 
-val elastic4sVersion = "6.2.8"
+val elastic4sVersion = "6.3.0"
 libraryDependencies ++= Seq(
   "com.sksamuel.elastic4s" %% "elastic4s-core" % elastic4sVersion,
 
@@ -39,6 +42,5 @@ lazy val webapi = (project in file(".")).
     buildInfoKeys := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion),
     buildInfoPackage := "de.upb.cs.swt.delphi.webapi"
   )
-scalastyleConfig := baseDirectory.value / "project" / "scalastyle-config.xml"
-
 
+scalastyleConfig := baseDirectory.value / "project" / "scalastyle_config.xml"

project/buildinfo.sbt

@@ -1,2 +1,13 @@
+// build management and packaging
+addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
 addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.2")
+
+// coverage
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
+addSbtPlugin("com.codacy" % "sbt-codacy-coverage" % "1.3.12")
+
+// preparation for dependency checking
+addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.1")
+
+// scalastyle
 addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")

project/plugins.sbt

@@ -114,4 +114,4 @@
  <check level="warning" class="org.scalastyle.scalariform.PublicMethodsHaveTypeChecker" enabled="true"></check>
  <check level="warning" class="org.scalastyle.file.NewLineAtEofChecker" enabled="true"></check>
  <check level="warning" class="org.scalastyle.file.NoNewLineAtEofChecker" enabled="false"></check>
-</scalastyle>
+</scalastyle>

project/scalastyle-config.xml renamed to project/scalastyle_config.xml

@@ -0,0 +1,19 @@
+package de.upb.cs.swt.delphi.querylanguage
+
+trait CombinatorialExpr
+
+case class AndExpr(Left: CombinatorialExpr, Right: CombinatorialExpr) extends CombinatorialExpr
+case class OrExpr(Left: CombinatorialExpr, Right: CombinatorialExpr) extends CombinatorialExpr
+case class NotExpr(Expr: CombinatorialExpr) extends CombinatorialExpr
+case class XorExpr(Left: CombinatorialExpr, Right: CombinatorialExpr) extends CombinatorialExpr
+
+trait SingularConditionExpr extends CombinatorialExpr
+
+case class EqualExpr(Left: String, Right: String) extends SingularConditionExpr
+case class NotEqualExpr(Left: String, Right: String) extends SingularConditionExpr
+case class GreaterThanExpr(Left: String, Right: String) extends SingularConditionExpr
+case class GreaterOrEqualExpr(Left: String, Right: String) extends SingularConditionExpr
+case class LessThanExpr(Left: String, Right: String) extends SingularConditionExpr
+case class LessOrEqualExpr(Left: String, Right: String) extends SingularConditionExpr
+case class LikeExpr(Left: String, Right: String) extends SingularConditionExpr
+case class TrueExpr(Expr: String) extends SingularConditionExpr

src/main/scala/de/upb/cs/swt/delphi/querylanguage/AST.scala

@@ -3,84 +3,55 @@ package de.upb.cs.swt.delphi.querylanguage
 import org.parboiled2.{CharPredicate, Parser, ParserInput, Rule1}
 
 /**
-  * Created by benhermann on 03.02.18.
+  * The syntax definition and parser for the Delphi QL.
+  *
+  * @author Lisa Nguyen Quang Do
+  * @author Ben Hermann
+  *
   */
 class Syntax(val input : ParserInput) extends Parser {
 
   def QueryRule = rule {
-    QueryElementRule ~ EOI
+    CombinatorialRule ~ EOI
   }
 
-  def QueryElementRule = rule {
-    FeatureIdentifierRule ~  ConditionRule
+  // Combinatorial rules.
+  def CombinatorialRule : Rule1[CombinatorialExpr] = rule {
+    OrOrElseRule | NotRule
   }
-
-  def FeatureIdentifierRule = rule {
-    capture(oneOrMore(CharPredicate.Alpha))
-  }
-
-  def ConditionRule = rule {
-    SingularConditionRule // | ConjunctionRule | DisjunctionRule
-  }
-
-  def SingularConditionRule = rule {
-    EqualRule |
-    NotEqualRule |
-    GreaterThanRule |
-    GreaterOrEqual |
-    LessThan |
-    LessOrEqual |
-    Like
+  def OrOrElseRule = rule {
+    AndOrElseRule ~ zeroOrMore("||" ~ AndOrElseRule ~> OrExpr)
   }
-
-  /*
-  def ConjunctionRule = rule {
-    ConditionRule ~ "&&" ~ ConditionRule
-  }
-
-  def DisjunctionRule = rule {
-    ConditionRule ~ "||" ~ ConditionRule
+  def AndOrElseRule = rule {
+    XorOrElseRule ~ zeroOrMore("&&" ~ XorOrElseRule ~> AndExpr)
   }
-  */
-
-  def Literal = rule {
-    NumberLiteral |
-    StringLiteral
+  def XorOrElseRule = rule {
+    Factor ~ zeroOrMore("%%" ~ Factor ~> XorExpr)
   }
 
-  def StringLiteral = rule {
-    capture(oneOrMore(CharPredicate.AlphaNum))
+  // Handling parentheses.
+  def Factor : Rule1[CombinatorialExpr] = rule {
+    Parentheses | SingularConditionRule | NotRule
   }
+  def Parentheses = rule { '(' ~ CombinatorialRule ~ ')' }
+  def NotRule = rule { '!' ~ Factor ~> NotExpr }
 
-  def NumberLiteral = rule {
-    capture(oneOrMore(CharPredicate.Digit))
-  }
-
-  def EqualRule = rule {
-    "=" ~ Literal
-  }
-  def NotEqualRule = rule {
-    "!=" ~ NumberLiteral
-  }
-  def GreaterThanRule = rule {
-    ">" ~ NumberLiteral
-  }
-  def GreaterOrEqual = rule {
-    ">=" ~ NumberLiteral
-  }
-
-  def LessThan = rule {
-    "<" ~ NumberLiteral
-  }
-  def LessOrEqual = rule {
-    "=<" ~ NumberLiteral
-  }
-
-  def Like = rule {
-    "~" ~ StringLiteral
-  }
+  // Singular conditions.
+  def SingularConditionRule = rule {
+    EqualRule | NotEqualRule | GreaterThanRule | GreaterOrEqual |
+      LessThan | LessOrEqual | Like | True
+  }
+  def EqualRule = rule { Literal ~ "=" ~ Literal ~> EqualExpr }
+  def NotEqualRule = rule { Literal ~ "!=" ~ Literal ~> NotEqualExpr }
+  def GreaterThanRule = rule { Literal ~ ">" ~ Literal ~> GreaterThanExpr }
+  def GreaterOrEqual = rule { Literal ~ ">=" ~ Literal ~> GreaterOrEqualExpr }
+  def LessThan = rule { Literal ~ "<" ~ Literal ~> LessThanExpr }
+  def LessOrEqual = rule { Literal ~ "<=" ~ Literal ~> LessOrEqualExpr }
+  def Like = rule { Literal ~ "%" ~ Literal ~> LikeExpr }
+  def True = rule { Literal ~> TrueExpr }
+
+  // Literals
+  def Literal = rule { capture(oneOrMore(CharPredicate.AlphaNum)) ~> (_.toString) }
 }
 
-class StringLiteral(value : String) {}
 
-class NumberLiteral(value : Integer) {}

src/main/scala/de/upb/cs/swt/delphi/querylanguage/Syntax.scala

@@ -2,8 +2,8 @@ package de.upb.cs.swt.delphi.webapi
 
 import akka.actor.{Actor, ActorLogging, Props}
 import com.sksamuel.elastic4s.IndexAndType
+import com.sksamuel.elastic4s.http.{ElasticClient, RequestFailure, RequestSuccess}
 import com.sksamuel.elastic4s.http.ElasticDsl._
-import com.sksamuel.elastic4s.http.HttpClient
 import de.upb.cs.swt.delphi.webapi.ElasticActorManager.{Enqueue, Retrieve}
 
 import scala.concurrent.ExecutionContext
@@ -12,7 +12,7 @@ import scala.concurrent.duration._
 class ElasticActor(configuration: Configuration, index: IndexAndType) extends Actor with ActorLogging{
 
   implicit val executionContext: ExecutionContext = context.system.dispatchers.lookup("elasticsearch-handling-dispatcher")
-  val client = HttpClient(configuration.elasticsearchClientUri)
+  val client = ElasticClient(configuration.elasticsearchClientUri)
 
   override def preStart(): Unit = log.info("Search actor started")
   override def postStop(): Unit = log.info("Search actor shut down")
@@ -25,11 +25,16 @@ class ElasticActor(configuration: Configuration, index: IndexAndType) extends Ac
 
   private def getSource(id: String) = {
     log.info("Executing get on entry {}", id)
-    def source = client.execute{
-      get(id).from(index)
-    }.await match {
-      case Right(res) => res.body.get
-      case Left(_) => Option.empty
+    def queryResponse = client.execute{
+      log.info(s"Got retrieve request for $id.")
+      searchWithType(index) query must (
+        matchQuery("name", s"http://repo1.maven.org/maven2/:$id")
+      )
+    }.await
+
+    val source = queryResponse match {
+      case results: RequestSuccess[_] => results.body.get
+      case failure: RequestFailure => Option.empty
     }
     sender().tell(source, context.self)
   }