Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make defaultPatternValues field of Specmatic Config nullable #1631

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make defaultPatternValues field of Specmatic Config nullable #1631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions core/src/main/kotlin/io/specmatic/core/SpecmaticConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ data class SpecmaticConfig(
private val additionalExampleParamsFilePath: String? = null,
private val attributeSelectionPattern: AttributeSelectionPattern = AttributeSelectionPattern(),
private val allPatternsMandatory: Boolean? = null,
private val defaultPatternValues: Map<String, Any> = emptyMap(),
private val defaultPatternValues: Map<String, Any>? = null,
private val version: SpecmaticConfigVersion? = null
) {
companion object {
Expand Down Expand Up @@ -381,7 +381,9 @@ data class SpecmaticConfig(

@JsonIgnore
fun parsedDefaultPatternValues(): Map<String, Value> {
return parsedJSONObject(ObjectMapper().writeValueAsString(defaultPatternValues)).jsonObject
return parsedJSONObject(
ObjectMapper().writeValueAsString(defaultPatternValues ?: emptyMap<String, Any>())
).jsonObject
}

@JsonIgnore
Expand Down Expand Up @@ -446,7 +448,7 @@ data class SpecmaticConfig(
}

@JsonIgnore
fun getDefaultPatternValues(): Map<String, Any> {
fun getDefaultPatternValues(): Map<String, Any>? {
return defaultPatternValues
}

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/kotlin/io/specmatic/core/config/v1/SpecmaticConfigV1.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import io.specmatic.core.utilities.Flags
import io.specmatic.core.utilities.Flags.Companion.EXAMPLE_DIRECTORIES
import io.specmatic.core.utilities.Flags.Companion.getStringValue

data class SpecmaticConfigV1 (
data class SpecmaticConfigV1(
@field:JsonAlias("contract_repositories")
val sources: List<Source> = emptyList(),
val auth: Auth? = null,
Expand All @@ -32,7 +32,7 @@ data class SpecmaticConfigV1 (
@field:JsonAlias("all_patterns_mandatory")
val allPatternsMandatory: Boolean? = null,
@field:JsonAlias("default_pattern_values")
val defaultPatternValues: Map<String, Any> = emptyMap(),
val defaultPatternValues: Map<String, Any>? = null,
val version: SpecmaticConfigVersion? = null
): SpecmaticVersionedConfig {
override fun transform(): SpecmaticConfig {
Expand Down
10 changes: 5 additions & 5 deletions core/src/main/kotlin/io/specmatic/core/config/v2/SpecmaticConfigV2.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ package io.specmatic.core.config.v2

import com.fasterxml.jackson.annotation.JsonAlias
import io.specmatic.core.*
import io.specmatic.core.SpecmaticConfig.Companion.getAttributeSelectionPattern
import io.specmatic.core.SpecmaticConfig.Companion.getAllPatternsMandatory
import io.specmatic.core.SpecmaticConfig.Companion.getAttributeSelectionPattern
import io.specmatic.core.SpecmaticConfig.Companion.getPipeline
import io.specmatic.core.SpecmaticConfig.Companion.getRepository
import io.specmatic.core.SpecmaticConfig.Companion.getSecurityConfiguration
import io.specmatic.core.SpecmaticConfig.Companion.getWorkflowConfiguration
import io.specmatic.core.SpecmaticConfig.Companion.getVirtualServiceConfiguration
import io.specmatic.core.SpecmaticConfig.Companion.getTestConfiguration
import io.specmatic.core.SpecmaticConfig.Companion.getStubConfiguration
import io.specmatic.core.SpecmaticConfig.Companion.getTestConfiguration
import io.specmatic.core.SpecmaticConfig.Companion.getVirtualServiceConfiguration
import io.specmatic.core.SpecmaticConfig.Companion.getWorkflowConfiguration
import io.specmatic.core.config.SpecmaticConfigVersion
import io.specmatic.core.config.SpecmaticVersionedConfig
import io.specmatic.core.config.SpecmaticVersionedConfigLoader
Expand Down Expand Up @@ -40,7 +40,7 @@ data class SpecmaticConfigV2(
@field:JsonAlias("all_patterns_mandatory")
val allPatternsMandatory: Boolean? = null,
@field:JsonAlias("default_pattern_values")
val defaultPatternValues: Map<String, Any> = emptyMap()
val defaultPatternValues: Map<String, Any>? = null
) : SpecmaticVersionedConfig {
override fun transform(): SpecmaticConfig {
return SpecmaticConfig(
Expand Down