refactor beanintrospector

Author: pjfanning

Diff for: src/main/scala/com/fasterxml/jackson/module/scala/introspect/BeanIntrospector.scala

@@ -184,12 +184,11 @@ object BeanIntrospector {
     //create properties for all appropriate fields
     val fields = for {
       cls <- hierarchy
-      scalaCaseObject = isScalaCaseObject(cls)
-      isScalaObject = ClassW(cls).isScalaObject
       field <- cls.getDeclaredFields
+      isScalaObject = ClassW(cls).isScalaObject || isScalaCaseObject(cls)
       name = maybePrivateName(field)
       if !name.contains('$')
-      if (isScalaObject || scalaCaseObject || isAcceptableField(field))
+      if isScalaObject || isAcceptableField(field)
       beanGetter = findBeanGetter(cls, name)
       beanSetter = findBeanSetter(cls, name)
     } yield PropertyDescriptor(name, findConstructorParam(hierarchy.head, name), Some(field), findGetter(cls, name), findSetter(cls, name), beanGetter, beanSetter)

Diff for: src/main/scala/com/fasterxml/jackson/module/scala/util/Classes.scala

@@ -29,11 +29,11 @@ trait ClassW extends PimpedType[Class[_]] {
     hasSigHelper(value)
   }
 
-  def isScalaObject: Boolean = findModuleField.isSuccess
+  def isScalaObject: Boolean = moduleField.isSuccess
 
-  def getModuleField: Option[Field] = findModuleField.toOption
+  def getModuleField: Option[Field] = moduleField.toOption
 
-  private def findModuleField: Try[Field] = Try(value.getField("MODULE$"))
+  private lazy val moduleField: Try[Field] = Try(value.getField("MODULE$"))
 }
 
 object ClassW {