Remove deprecated declarations from project code, cleanup usages

2017-03-21 12:39:30 +03:00
parent 6a049c9ab5
commit 579238c3be
16 changed files with 18 additions and 59 deletions
@@ -102,13 +102,8 @@ class LoggingStorageManager(
        return CallData(outerInstance, containingField, enclosingEntity, arguments, result)
    }

-    private fun enclosingEntity(_class: Class<out Any>): GenericDeclaration? {
-        val result = _class.enclosingConstructor
-            ?: _class.enclosingMethod
-            ?: _class.enclosingClass
-
-        return result as GenericDeclaration?
-    }
+    private fun enclosingEntity(klass: Class<out Any>): GenericDeclaration? =
+            klass.enclosingConstructor ?: klass.enclosingMethod ?: klass.enclosingClass

    private fun Class<*>.getAllDeclaredFields(): List<Field> {
        val result = arrayListOf<Field>()