Simplify asserter acquisition.

2015-09-02 16:38:55 +03:00
parent 708ceb4aff
commit 267aad3926
1 changed files with 2 additions and 10 deletions
@@ -33,17 +33,9 @@ private var _asserter: Asserter? = null
 public var asserter: Asserter
    get() {
        if (_asserter == null) {
-            val klass = javaClass<Asserter>()
+            val klass = Asserter::class.java
            val loader = ServiceLoader.load(klass)
-            for (a in loader) {
-                if (a != null) {
-                    _asserter = a
-                    break
-                }
-            }
-            if (_asserter == null) {
-                _asserter = DefaultAsserter()
-            }
+            _asserter = loader.firstOrNull { it != null } ?: DefaultAsserter()
            //debug("using asserter $_asserter")
        }
        return _asserter!!