KoDI

Prosumma · Sep 19, 2021 · 826f1fd · 826f1fd
1 parent b3ee002
commit 826f1fd
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 65 deletions.
diff --git a/.idea/.name b/.idea/.name
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
@@ -41,64 +41,4 @@ dependencies {
 
     // This dependency is exported to consumers, that is to say found on their compile classpath.
     api("org.apache.commons:commons-math3:3.6.1")
-}
-
-// Library Publishing
-val sourcesJar by tasks.creating(Jar::class) {
-    from(sourceSets["main"].java.srcDirs)
-    archiveClassifier.set("sources")
-}
-
-/*
-val doc by tasks.creating(Javadoc::class) {
-    source = sourceSets["main"].allSource
-}
-
-val javadocJar by tasks.creating(Jar::class) {
-    dependsOn(doc)
-    from(doc)
-    archiveClassifier.set("javadoc")
-}
- */
-
-artifacts {
-//    archives(tasks.getByName("javadocJar"))
-    archives(tasks.getByName("sourcesJar"))
-}
-
-publishing {
-    repositories {
-        maven {
-            name = "GitHubPackages"
-            url = uri("https://maven.pkg.github.com/prosumma/KoDI")
-            credentials {
-                username = System.getenv("GITHUB_USER")
-                password = System.getenv("GITHUB_TOKEN")
-            }
-        }
-    }
-    publications {
-        create<MavenPublication>("main") {
-            groupId = project.group.toString()
-            artifactId = "KoDI"
-            version = "0.1.0"
-            artifact(sourcesJar)
-//            artifact(javadocJar)
-//            artifact("$buildDir/outputs/aar/${artifactId}-release.aar")
-            pom.withXml {
-                val dependencies = asNode().appendNode("dependencies")
-                configurations.getByName("implementation").dependencies.forEach {
-                    if (it.group != null &&
-                        it.name != "unspecified" &&
-                        it.version != null
-                    ) {
-                        val dependencyNode = dependencies.appendNode("dependency")
-                        dependencyNode.appendNode("groupId", it.group)
-                        dependencyNode.appendNode("artifactId", it.name)
-                        dependencyNode.appendNode("version", it.version)
-                    }
-                }
-            }
-        }
-    }
-}
+}
diff --git a/lib/src/main/kotlin/com/prosumma/di/Params.kt b/lib/src/main/kotlin/com/prosumma/di/Params.kt
@@ -3,12 +3,17 @@ package com.prosumma.di
 /**
  * Class used to pass params.
  */
-class Params(vararg params: Any) {
+class Params(vararg params: Any?) {
     private val parameters = params
 
     @Suppress("UNCHECKED_CAST")
     operator fun <T> get(index: Int): T = parameters[index] as T
 
+    fun <T> getOrNull(index: Int): T? =
+        if (index < parameters.size)
+            this[index]
+            else null
+
     operator fun <T> component1(): T = this[0]
     operator fun <T> component2(): T = this[1]
     operator fun <T> component3(): T = this[2]

diff --git a/lib/src/test/kotlin/com/prosumma/di/AssemblyTest.kt b/lib/src/test/kotlin/com/prosumma/di/AssemblyTest.kt
@@ -37,7 +37,7 @@ class AssemblyTest {
     }
 
     @Test
-    fun `assembly is registered only once`() {
+    fun `assembly is registered only once by type`() {
         val container = DIContainer()
         val assembly1 = ServiceAssembly()
         val assembly2 = ServiceAssembly()

diff --git a/lib/src/test/kotlin/com/prosumma/di/ParamsTest.kt b/lib/src/test/kotlin/com/prosumma/di/ParamsTest.kt
@@ -6,9 +6,10 @@ import kotlin.test.assertNull
 import kotlin.test.assertTrue
 
 class ParamsTest {
+    @Test
     fun `parameter destructuring`() {
         val s: String? = null
-        val params = Params(7, "something", 4.3, true, s as Any)
+        val params = Params(7, "something", 4.3, true, s)
         val (i: Int, s2: String, f: Double, b: Boolean, q: String?) = params
         assertEquals(i, 7)
         assertEquals(s2, "something")
@@ -17,6 +18,13 @@ class ParamsTest {
         assertNull(q)
     }
 
+    @Test
+    fun getOrNull() {
+        val params = Params(3)
+        assertNull(params.getOrNull(1) as String?)
+    }
+
+    @Test
     fun `type coercion`() {
         fun coerce(s: String) = s
         val params = Params("something")

diff --git a/lib/src/test/kotlin/com/prosumma/di/ResolverTest.kt b/lib/src/test/kotlin/com/prosumma/di/ResolverTest.kt
@@ -6,7 +6,6 @@ import kotlin.test.*
 class ResolverTest {
     class Service
     class SuperService(val service: Service)
-
     class Something(val s: String)
 
     @Test