rework TastyUtil

Author: pjfanning

src/main/scala/com/fasterxml/jackson/module/scala/util/TastyUtil.scala

@@ -7,19 +7,24 @@ private[util] object TastyUtil {
 
   @tailrec
   def hasTastyFile(clz: Class[_]): Boolean = {
-    clz != null && getClassName(clz) != null && {
-      val baseName = getClassName(clz).replace(".", "/")
-      val classFileBase = if (baseName.endsWith("$")) {
-        baseName.substring(0, baseName.length - 1)
-      } else {
-        baseName
-      }
-      val tastyFile = s"/$classFileBase.tasty"
-      Option(thisClass.getResource(tastyFile)).isDefined || hasTastyFile(clz.getEnclosingClass)
+    if (clz == null) {
+      false
+    } else {
+      lazy val className = getClassName(clz)
+      className != null && {
+        val baseName = className.replace(".", "/")
+        val classFileBase = if (baseName.endsWith("$")) {
+          baseName.substring(0, baseName.length - 1)
+        } else {
+          baseName
+        }
+        val tastyFile = s"/$classFileBase.tasty"
+        Option(thisClass.getResource(tastyFile)).isDefined
+      } || hasTastyFile(clz.getEnclosingClass)
     }
   }
 
-  private def getClassName(clz: Class[_]) = {
+  private def getClassName(clz: Class[_]): String = {
     try clz.getCanonicalName catch {
       case _: InternalError => null
     }

src/test/scala/com/fasterxml/jackson/module/scala/QuxClassTagExtensionsTest.scala

@@ -4,14 +4,9 @@ import com.fasterxml.jackson.databind.json.JsonMapper
 
 class QuxClassTagExtensionsTest extends BaseSpec {
   "An ObjectMapper with the ClassTagExtensions mixin" should "deserialize Qux" in {
-    val javaVersion = System.getProperty("java.specification.version")
-    if (javaVersion == "1.8") {
-      //skip - this test fails on Java 1.8 - see https://github.com/FasterXML/jackson-module-scala/issues/542
-    } else {
-      val objectMapper = JsonMapper
-        .builder().addModule(DefaultScalaModule).build() :: ClassTagExtensions
-      val qux = objectMapper.readValue[Qux]("""{"qux": {"num": "3"}}""")
-      qux.qux.num shouldEqual 3
-    }
+    val objectMapper = JsonMapper
+      .builder().addModule(DefaultScalaModule).build() :: ClassTagExtensions
+    val qux = objectMapper.readValue[Qux]("""{"qux": {"num": "3"}}""")
+    qux.qux.num shouldEqual 3
   }
 }