Merge pull request #333 from dwijnand/cleanup-ProblemFilters-and-Problems

Cleanup ProblemFilters and Problems

Author: dwijnand

core/src/main/scala/com/typesafe/tools/mima/core/ProblemFilters.scala

@@ -1,22 +1,22 @@
 package com.typesafe.tools.mima.core
-import scala.reflect.ClassTag
+
+import scala.reflect.{ ClassTag, classTag }
 import java.util.regex.Pattern
 
 object ProblemFilters {
 
   private case class ExcludeByName[P <: ProblemRef: ClassTag](name: String) extends ProblemFilter {
     private[this] val pattern = Pattern.compile(name.split("\\*", -1).map(Pattern.quote).mkString(".*"))
+
     override def apply(problem: Problem): Boolean = {
-      !(implicitly[ClassTag[P]].runtimeClass.isAssignableFrom(problem.getClass) &&
+      !(classTag[P].runtimeClass.isAssignableFrom(problem.getClass) &&
         pattern.matcher(problem.matchName.getOrElse("")).matches)
     }
 
-    override def toString(): String = """ExcludeByName[%s]("%s")""".format(implicitly[ClassTag[P]].runtimeClass.getSimpleName, name)
+    override def toString() = s"""ExcludeByName[${classTag[P].runtimeClass.getSimpleName}]("$name")"""
   }
 
-  def exclude[P <: ProblemRef: ClassTag](name: String): ProblemFilter = {
-    ExcludeByName[P](name)
-  }
+  def exclude[P <: ProblemRef: ClassTag](name: String): ProblemFilter = ExcludeByName[P](name)
 
   /**
    *  Creates exclude filter by taking name of a problem and name of a match (e.g. class/method name).
@@ -26,12 +26,12 @@ object ProblemFilters {
    *  @throws ClassNotFoundException if the class corresponding to the problem cannot be located
    */
   def exclude(problemName: String, name: String): ProblemFilter = {
-    val problemClass: Class[_ <: ProblemRef] = Class.forName("com.typesafe.tools.mima.core." + problemName).asInstanceOf[Class[_ <: ProblemRef]]
+    val problemClass: Class[_ <: ProblemRef] =
+      Class.forName(s"com.typesafe.tools.mima.core.$problemName").asInstanceOf[Class[_ <: ProblemRef]]
     exclude(name)(ClassTag(problemClass))
   }
 
   @deprecated("Replace with ProblemFilters.exclude[Problem](\"my.package.*\")", "0.1.15")
-  def excludePackage(packageName: String): ProblemFilter = {
-    exclude[Problem](packageName + ".*")
-  }
+  def excludePackage(packageName: String): ProblemFilter = exclude[Problem](s"$packageName.*")
+
 }

core/src/main/scala/com/typesafe/tools/mima/core/Problems.scala

@@ -10,9 +10,8 @@ trait ProblemRef {
   def matchName: Option[String] = None
 
   // description of how to make a filter rule
-  def howToFilter: Option[String] = matchName.map{ name =>
-    """ProblemFilters.exclude[%s]("%s")""".format(this.getClass.getSimpleName, name)
-  }
+  def howToFilter: Option[String] =
+    matchName.map(name => s"""ProblemFilters.exclude[${getClass.getSimpleName}]("$name")""")
 }
 
 trait TemplateRef extends ProblemRef {