Refactored HermesActor

Author: bhermann

src/main/scala/de/upb/cs/swt/delphi/crawler/processing/HermesActor.scala

@@ -17,46 +17,22 @@
 package de.upb.cs.swt.delphi.crawler.processing
 
 import java.net.URL
-import java.util.jar.JarInputStream
 
 import akka.actor.{Actor, ActorLogging, ActorRef, Props}
 import de.upb.cs.swt.delphi.crawler.discovery.maven.MavenIdentifier
 import de.upb.cs.swt.delphi.crawler.preprocessing.MavenArtifact
-import de.upb.cs.swt.delphi.crawler.tools.ClassStreamReader
 import org.opalj.br.analyses.Project
-import org.opalj.hermes.{Feature, FeatureQuery}
 
-class HermesActor(elasticActor : ActorRef) extends Actor with ActorLogging {
-
-
-  def transformToFeatures(results: Iterator[(FeatureQuery, TraversableOnce[Feature[URL]])]): Map[String, Int] = {
-    results.flatMap{ case(query, features: TraversableOnce[Feature[URL]]) => features.map { case feature => feature.id -> feature.count}} toMap
-  }
+class HermesActor(elasticActor : ActorRef) extends Actor with ActorLogging with OPALFunctionality with HermesFunctionality {
 
   def receive: PartialFunction[Any, Unit] = {
     case m : MavenArtifact => {
       log.info(s"Starting analysis for $m")
-      val project: Project[URL] = reifyProject(m)
 
+      val project: Project[URL] = reifyProject(m)
       val hermesResult: HermesResults = computeHermesResult(m, project)
-
       elasticActor ! hermesResult
     }
-
-  }
-
-  private def computeHermesResult(m: MavenArtifact, project: Project[URL]) = {
-    val results = new HermesAnalyzer(project).analyzeProject()
-    val featureMap = transformToFeatures(results)
-    val hermesResult = HermesResults(m.identifier, featureMap)
-    log.info(s"Feature map for ${hermesResult.identifier.toUniqueString} is ${hermesResult.featureMap.size}.")
-    hermesResult
-  }
-
-  private def reifyProject(m: MavenArtifact) = {
-    val project = new ClassStreamReader {}.createProject(m.identifier.toJarLocation.toURL,
-      new JarInputStream(m.jarFile.is))
-    project
   }
 }
 

src/main/scala/de/upb/cs/swt/delphi/crawler/processing/HermesFunctionality.scala

@@ -0,0 +1,36 @@
+// Copyright (C) 2018 The Delphi Team.
+// See the LICENCE file distributed with this work for additional
+// information regarding copyright ownership.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package de.upb.cs.swt.delphi.crawler.processing
+import java.net.URL
+
+import de.upb.cs.swt.delphi.crawler.preprocessing.MavenArtifact
+import org.opalj.br.analyses.Project
+import org.opalj.hermes.{Feature, FeatureQuery}
+
+trait HermesFunctionality {
+
+  def transformToFeatures(results: Iterator[(FeatureQuery, TraversableOnce[Feature[URL]])]): Map[String, Int] = {
+    results.flatMap { case (query, features: TraversableOnce[Feature[URL]]) => features.map { case feature => feature.id -> feature.count } } toMap
+  }
+
+  def computeHermesResult(m: MavenArtifact, project: Project[URL]): HermesResults = {
+    val results = new HermesAnalyzer(project).analyzeProject()
+    val featureMap = transformToFeatures(results)
+    val hermesResult = HermesResults(m.identifier, featureMap)
+    hermesResult
+  }
+}

src/main/scala/de/upb/cs/swt/delphi/crawler/processing/OPALFunctionality.scala

@@ -0,0 +1,33 @@
+// Copyright (C) 2018 The Delphi Team.
+// See the LICENCE file distributed with this work for additional
+// information regarding copyright ownership.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package de.upb.cs.swt.delphi.crawler.processing
+import java.net.URL
+import java.util.jar.JarInputStream
+
+import de.upb.cs.swt.delphi.crawler.preprocessing.MavenArtifact
+import de.upb.cs.swt.delphi.crawler.tools.ClassStreamReader
+import org.opalj.br.analyses.Project
+
+trait OPALFunctionality {
+
+  def reifyProject(m: MavenArtifact): Project[URL] = {
+    val project = new ClassStreamReader {}.createProject(m.identifier.toJarLocation.toURL,
+      new JarInputStream(m.jarFile.is))
+    m.jarFile.is.close()
+    project
+  }
+}