Skip to content

Commit faa626e

Browse files
committed
Remove InstanceCreator
This allows for dropping the dependency on kotlin-reflect. It still existed as a backup, but seems not to be necessary.
1 parent 77f25c1 commit faa626e

File tree

10 files changed

+11
-1034
lines changed

10 files changed

+11
-1034
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.gradle
22
build/
3+
out/
34

45
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
56
!gradle-wrapper.jar

mockito-kotlin/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ repositories {
2525

2626
dependencies {
2727
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
28-
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
2928
compile "org.mockito:mockito-core:2.12.0"
3029

3130
/* Tests */

mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin/MockitoKotlin.kt

Lines changed: 0 additions & 85 deletions
This file was deleted.

mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin/createinstance/CreateInstance.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import java.lang.reflect.Array as JavaArray
3030

3131

3232
inline fun <reified T : Any> createInstance(): T
33-
= createInstance(T::class)
33+
= createInstance(T::class)
3434

3535
fun <T : Any> createInstance(kClass: KClass<T>): T
36-
= nonNullProvider().createInstance(kClass)
36+
= NonNullProvider.create().createInstance(kClass)

mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin/createinstance/InstanceCreator.kt

Lines changed: 0 additions & 183 deletions
This file was deleted.

mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin/createinstance/NonNullProvider.kt

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,9 @@ import java.lang.reflect.Array as JavaArray
66
interface NonNullProvider {
77

88
fun <T : Any> createInstance(kClass: KClass<T>): T
9-
}
10-
11-
fun nonNullProvider(): NonNullProvider = NonNullProviderImpl(listOf(NullCaster(), InstanceCreator()))
129

13-
internal class NonNullProviderImpl(
14-
private val nonNullProviders: List<NonNullProvider>
15-
) : NonNullProvider {
16-
17-
override fun <T : Any> createInstance(kClass: KClass<T>): T {
18-
return firstNonErroring(
19-
nonNullProviders.map { { it.createInstance(kClass) } }
20-
)
21-
}
10+
companion object Factory {
2211

23-
private fun <T> firstNonErroring(functions: List<() -> T>): T {
24-
var error: Throwable? = null
25-
functions.forEach { f ->
26-
try {
27-
return f()
28-
} catch(e: Throwable) {
29-
error = e
30-
}
31-
}
32-
throw error ?: IllegalStateException()
12+
fun create(): NonNullProvider = NullCaster()
3313
}
3414
}

mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin/createinstance/NullCaster.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@ internal class NullCaster : NonNullProvider {
1414
return castNull()
1515
}
1616

17+
@Suppress("UNCHECKED_CAST")
1718
private fun <T> castNull(): T = null as T
1819
}

0 commit comments

Comments
 (0)