Fixed retrieve query

Author: bhermann

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

@@ -23,8 +23,8 @@ import de.upb.cs.swt.delphi.webapi.artifacts.Identifier
 
 case class MavenIdentifier(val repository: Option[String], val groupId: String, val artifactId: String, val version: Option[String]) extends Identifier {
 
-  def toUniqueString = {
-    repository + ":" + groupId + ":" + artifactId + ":" + version
+  def toUniqueString: String = {
+    repository.getOrElse(MavenIdentifier.DefaultRepository) + ":" + groupId + ":" + artifactId + ":" + version.getOrElse("")
   }
 
   override val toString: String = groupId + ":" + artifactId + ":" + version
@@ -38,7 +38,7 @@ case class MavenIdentifier(val repository: Option[String], val groupId: String,
   }
 
   private def constructArtifactBaseUri(): URI =
-    new URI(repository.getOrElse(""))
+    new URI(repository.getOrElse(MavenIdentifier.DefaultRepository))
       .resolve(encode(groupId).replace('.', '/') + "/")
       .resolve(encode(artifactId) + "/")
       .resolve(encode(version.getOrElse("")) + "/")
@@ -48,16 +48,15 @@ case class MavenIdentifier(val repository: Option[String], val groupId: String,
 }
 
 object MavenIdentifier {
+  private val DefaultRepository = "http://repo1.maven.org/maven2/"
+
   private implicit def wrapOption[A](value : A) : Option[A] = Some(value)
+
   def apply(s: String): Option[MavenIdentifier] = {
     val splitString: Array[String] = s.split(':')
     if (splitString.length < 2 || splitString.length > 3) return None
-    //if (splitString(0).startsWith("http")) {
-    //  if (splitString.length < 3) return None
-    //  MavenIdentifier(splitString(0), splitString(1), splitString(2), if (splitString.length < 4) None else splitString(3))
-    //} else {
-      //if (splitString.length > 3) return None
-      MavenIdentifier(None, splitString(0), splitString(1), if (splitString.length < 3) None else splitString(2))
-    //}
+
+    MavenIdentifier(None, splitString(0), splitString(1), if (splitString.length < 3) None else splitString(2))
+
   }
 }

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

@@ -16,65 +16,40 @@
 
 package de.upb.cs.swt.delphi.webapi
 
-import com.sksamuel.elastic4s.http.ElasticDsl.{termQuery, _}
-import com.sksamuel.elastic4s.http.search.SearchResponse
+import com.sksamuel.elastic4s.http.ElasticDsl._
+import com.sksamuel.elastic4s.http.get.GetResponse
 import com.sksamuel.elastic4s.http.{ElasticClient, RequestSuccess, Response}
-import com.sksamuel.elastic4s.searches.queries.Query
-import com.sksamuel.elastic4s.searches.queries.term.TermQuery
-import de.upb.cs.swt.delphi.webapi.artifacts.ArtifactTransformer
+import de.upb.cs.swt.delphi.webapi.artifacts.{Artifact, ArtifactTransformer}
 
 object RetrieveQuery {
-  def retrieve(identifier: String)(implicit configuration: Configuration) = {
+
+  def retrieve(identifier: String)(implicit configuration: Configuration): Option[List[Artifact]] = {
     val client = ElasticClient(configuration.elasticsearchClientUri)
 
     val parsedIdentifier = MavenIdentifier(identifier)
 
-
     parsedIdentifier match {
       case None => None
       case Some(m) => {
-        val response: Response[SearchResponse] = client.execute {
-          searchWithType(configuration.esProjectIndex) query {
-            bool {
-              must(
-                constructIdQuery(m)
-              )
-            }
-          }
+
+        val response: Response[GetResponse] = client.execute {
+          get(configuration.esProjectIndex.index, configuration.esProjectIndex.`type`, m.toUniqueString)
         }.await
 
         response match {
-          case RequestSuccess(_, body, _, results: SearchResponse) => {
-            results.totalHits match {
-              case 0L => None
+          case RequestSuccess(_, body, _, results: GetResponse) => {
+            results.found match {
+              case false => None
               case _ => {
-                Some(ArtifactTransformer.transformResults(results.hits))
+                Some(List(ArtifactTransformer.transformResult(results.id, results.sourceAsMap)))
               }
             }
           }
           case _ => None
         }
       }
     }
-
-
   }
-
-  private def constructIdQuery(m: MavenIdentifier): Iterable[Query] = {
-    val baseQuery: List[TermQuery] = List(
-      termQuery("identifier.groupId", m.groupId),
-      termQuery("identifier.artifactId", m.artifactId)
-    )
-    m.version.isDefined match {
-      case true => {
-        baseQuery.+:(termQuery("identifier.version", m.version.getOrElse("")))
-      }
-      case false => {
-        baseQuery
-      }
-    }
-  }
-
 }
 
 

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

@@ -38,12 +38,17 @@ object ArtifactTransformer {
       identifier("groupId"), identifier("artifactId"), identifier("version"))
   }
 
-  private def transformResult(h: SearchHit) = {
-    val sourceMap = h.sourceAsMap
-    Artifact(h.id, getMetadata(sourceMap), getHermesResults(sourceMap))
+  def transformResult(id : String, sourceMap : Map[String, AnyRef]) :Artifact = {
+    Artifact(id, getMetadata(sourceMap), getHermesResults(sourceMap))
   }
 
-  def transformResults(hits: SearchHits) = {
+
+  private def transformResult(h: SearchHit): Artifact = {
+    transformResult(h.id, h.sourceAsMap)
+  }
+
+
+  def transformResults(hits: SearchHits): Array[Artifact] = {
     hits.hits.map(h => transformResult(h))
   }