-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
scope(field-map): replace field maps by DefaultFieldMap or StrictFiel…
…dMap instead of regular map
- Loading branch information
Showing
18 changed files
with
122 additions
and
43 deletions.
There are no files selected for viewing
3 changes: 3 additions & 0 deletions
3
core/src/commonMain/kotlin/io/github/magonxesp/criteria/domain/FieldMapExceptions.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
package io.github.magonxesp.criteria.domain | ||
|
||
class RequiredFieldException(override val message: String? = null) : Exception(message) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 0 additions & 7 deletions
7
core/src/commonMain/kotlin/io/github/magonxesp/criteria/infrastructure/FieldMap.kt
This file was deleted.
Oops, something went wrong.
5 changes: 5 additions & 0 deletions
5
.../src/commonMain/kotlin/io/github/magonxesp/criteria/infrastructure/map/DefaultFieldMap.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
package io.github.magonxesp.criteria.infrastructure.map | ||
|
||
class DefaultFieldMap(override val map: Map<String, String> = mapOf()) : FieldMap() | ||
|
||
fun fieldMapOf(vararg mapping: Pair<String, String>) = DefaultFieldMap(map = mapping.toMap()) |
6 changes: 6 additions & 0 deletions
6
core/src/commonMain/kotlin/io/github/magonxesp/criteria/infrastructure/map/FieldMap.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
package io.github.magonxesp.criteria.infrastructure.map | ||
|
||
abstract class FieldMap { | ||
abstract val map: Map<String, String> | ||
open operator fun get(index: String): String = map[index] ?: index | ||
} |
10 changes: 10 additions & 0 deletions
10
core/src/commonMain/kotlin/io/github/magonxesp/criteria/infrastructure/map/StrictFieldMap.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
package io.github.magonxesp.criteria.infrastructure.map | ||
|
||
import io.github.magonxesp.criteria.domain.RequiredFieldException | ||
|
||
class StrictFieldMap(override val map: Map<String, String>) : FieldMap() { | ||
override fun get(index: String): String = map[index] | ||
?: throw RequiredFieldException("The field $index is not present in field map") | ||
} | ||
|
||
fun strictFieldMapOf(vararg mapping: Pair<String, String>) = StrictFieldMap(map = mapping.toMap()) |
28 changes: 28 additions & 0 deletions
28
.../commonTest/kotlin/io/github/magonxesp/criteria/infrastructure/map/DefaultFieldMapTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
package io.github.magonxesp.criteria.infrastructure.map | ||
|
||
import io.kotest.core.spec.style.AnnotationSpec | ||
import io.kotest.matchers.shouldBe | ||
|
||
class DefaultFieldMapTest : AnnotationSpec() { | ||
@Test | ||
fun `it should map a field`() { | ||
val map = fieldMapOf( | ||
"author" to "author.name" | ||
) | ||
|
||
val mapped = map["author"] | ||
|
||
mapped shouldBe "author.name" | ||
} | ||
|
||
@Test | ||
fun `it should map a not existing field`() { | ||
val map = fieldMapOf( | ||
"author" to "author.name" | ||
) | ||
|
||
val mapped = map["title"] | ||
|
||
mapped shouldBe "title" | ||
} | ||
} |
30 changes: 30 additions & 0 deletions
30
...c/commonTest/kotlin/io/github/magonxesp/criteria/infrastructure/map/StrictFieldMapTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
package io.github.magonxesp.criteria.infrastructure.map | ||
|
||
import io.github.magonxesp.criteria.domain.RequiredFieldException | ||
import io.kotest.assertions.throwables.shouldThrow | ||
import io.kotest.core.spec.style.AnnotationSpec | ||
import io.kotest.matchers.shouldBe | ||
|
||
class StrictFieldMapTest : AnnotationSpec() { | ||
@Test | ||
fun `it should map a field`() { | ||
val map = strictFieldMapOf( | ||
"author" to "author.name" | ||
) | ||
|
||
val mapped = map["author"] | ||
|
||
mapped shouldBe "author.name" | ||
} | ||
|
||
@Test | ||
fun `it should not map a not existing field`() { | ||
val map = strictFieldMapOf( | ||
"author" to "author.name" | ||
) | ||
|
||
shouldThrow<RequiredFieldException> { | ||
map["title"] | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
...main/kotlin/io/github/magonxesp/criteria/infrastructure/jpa/FiltersJpaPredicateAdapter.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 3 additions & 4 deletions
7
...src/main/kotlin/io/github/magonxesp/criteria/infrastructure/jpa/OrderByJpaOrderAdapter.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters