Refactorings

Author: bhermann

src/it/scala/de/upb/cs/swt/delphi/webapi/ElasticActorTest.scala

@@ -16,13 +16,12 @@
 
 package de.upb.cs.swt.delphi.webapi
 
-import de.upb.cs.swt.delphi.webapi.featuredefinitions.FeatureExtractor
 import org.scalatest.{FlatSpec, Matchers}
 
-class FeatureExtractorCheck extends FlatSpec with Matchers {
+class FeatureQueryCheck extends FlatSpec with Matchers {
   "FeatureExtractor" should "provide a list of features" in {
     val configuration = new Configuration()
-    val featureList = new FeatureExtractor(configuration).featureList
+    val featureList = new FeatureQuery(configuration).featureList
 
     featureList.size should be > 0
   }

…elphi/webapi/FeatureExtractorCheck.scala …wt/delphi/webapi/FeatureQueryCheck.scalasrc/it/scala/de/upb/cs/swt/delphi/webapi/FeatureExtractorCheck.scala renamed to src/it/scala/de/upb/cs/swt/delphi/webapi/FeatureQueryCheck.scala src/it/scala/de/upb/cs/swt/delphi/webapi/FeatureExtractorCheck.scala renamed to src/it/scala/de/upb/cs/swt/delphi/webapi/FeatureQueryCheck.scala

@@ -16,7 +16,6 @@
 
 package de.upb.cs.swt.delphi.webapi
 
-import de.upb.cs.swt.delphi.webapi.featuredefinitions.FeatureExtractor
 import de.upb.cs.swt.delphi.webapi.search.{QueryRequest, SearchQuery}
 import org.scalatest.{FlatSpec, Matchers}
 
@@ -25,7 +24,7 @@ import scala.util.Success
 class SearchQueryTest extends FlatSpec with Matchers {
   "Search query" should "check for fields" in {
     val configuration = new Configuration()
-    val q = new SearchQuery(configuration, new FeatureExtractor(configuration))
+    val q = new SearchQuery(configuration, new FeatureQuery(configuration))
 
     val response = q.search(QueryRequest("[if_icmpeq (opcode:159)]>1"))
     response shouldBe a [Success[_]]

src/it/scala/de/upb/cs/swt/delphi/webapi/SearchQueryTest.scala

@@ -14,16 +14,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package de.upb.cs.swt.delphi.webapi.featuredefinitions
+package de.upb.cs.swt.delphi.webapi
 
-import com.sksamuel.elastic4s.http.{ElasticClient, RequestSuccess}
 import com.sksamuel.elastic4s.http.ElasticDsl._
-import com.sksamuel.elastic4s.http.index.mappings.IndexMappings
-import de.upb.cs.swt.delphi.webapi.Configuration
+import com.sksamuel.elastic4s.http.{ElasticClient, RequestSuccess}
 import org.slf4j.LoggerFactory
 import spray.json._
 
-class FeatureExtractor(configuration: Configuration) {
+class FeatureQuery(configuration: Configuration) {
   private val log = LoggerFactory.getLogger(this.getClass)
 
   lazy val featureList: Iterable[String] = {

…eaturedefinitions/FeatureExtractor.scala …/cs/swt/delphi/webapi/FeatureQuery.scalasrc/main/scala/de/upb/cs/swt/delphi/webapi/featuredefinitions/FeatureExtractor.scala renamed to src/main/scala/de/upb/cs/swt/delphi/webapi/FeatureQuery.scala src/main/scala/de/upb/cs/swt/delphi/webapi/featuredefinitions/FeatureExtractor.scala renamed to src/main/scala/de/upb/cs/swt/delphi/webapi/FeatureQuery.scala

@@ -26,7 +26,6 @@ import akka.util.Timeout
 import de.upb.cs.swt.delphi.instancemanagement.InstanceRegistry
 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.featuredefinitions.FeatureExtractor
 import de.upb.cs.swt.delphi.webapi.search.{QueryRequest, SearchQuery}
 import spray.json._
 
@@ -67,7 +66,7 @@ object Server extends HttpApp with JsonSupport with AppLogging {
     }
   }
 
-  private val featureExtractor = new FeatureExtractor(configuration)
+  private val featureExtractor = new FeatureQuery(configuration)
 
   private def features = {
     get {