@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.JsonNode
44import com.fasterxml.jackson.databind.ObjectMapper
55import com.networknt.schema.JsonSchemaFactory
66import com.networknt.schema.OutputFormat
7+ import com.networknt.schema.PathType
78import com.networknt.schema.SchemaValidatorsConfig
89import com.networknt.schema.SpecVersion.VersionFlag.V7
910import com.networknt.schema.output.OutputFlag
@@ -65,7 +66,15 @@ abstract class AbstractComparisonBenchmark {
6566 val factory = JsonSchemaFactory .getInstance(V7 )
6667 networkntSchema =
6768 Path .of(schemaPath).inputStream().use {
68- factory.getSchema(it, SchemaValidatorsConfig ())
69+ factory.getSchema(
70+ it,
71+ SchemaValidatorsConfig
72+ .builder()
73+ .pathType(PathType .JSON_POINTER )
74+ .errorMessageKeyword(" message"
75+ .nullableKeywordEnabled(false )
76+ .build(),
77+ )
6978 }
7079 networkntDocument =
7180 Path .of(objectPath).inputStream().use {
@@ -77,7 +86,8 @@ abstract class AbstractComparisonBenchmark {
7786 private fun setupKmp () {
7887 schema =
7988 Path .of(schemaPath).inputStream().use {
80- io.github.optimumcode.json.schema.JsonSchema .fromStream(it)
89+ io.github.optimumcode.json.schema.JsonSchema
90+ .fromStream(it)
8191 }
8292 document =
8393 Path .of(objectPath).inputStream().use {
@@ -94,34 +104,30 @@ abstract class AbstractComparisonBenchmark {
94104 openapiSchema = store.getSchema(uri)
95105 openapiDocument =
96106 JsonInstance (
97- converter.convert(Path .of(objectPath).inputStream().use { it.readAllBytes() }.toString(Charsets .UTF_8 )),
107+ converter.convert(
108+ Path
109+ .of(objectPath)
110+ .inputStream()
111+ .use { it.readAllBytes() }
112+ .toString(Charsets .UTF_8 ),
113+ ),
98114 )
99115 }
100116
101117 @Benchmark
102- fun validateOpenApi (): ValidationStep {
103- return openapiValidator.validate(openapiSchema, openapiDocument)
104- }
118+ fun validateOpenApi (): ValidationStep = openapiValidator.validate(openapiSchema, openapiDocument)
105119
106120 @Benchmark
107- fun validateNetworkntFlag (): OutputFlag ? {
108- return networkntSchema.validate(networkntDocument, OutputFormat .FLAG )
109- }
121+ fun validateNetworkntFlag (): OutputFlag ? = networkntSchema.validate(networkntDocument, OutputFormat .FLAG )
110122
111123 @Benchmark
112- fun validateNetworkntDetailed (): OutputUnit {
113- return networkntSchema.validate(networkntDocument, OutputFormat .LIST )
114- }
124+ fun validateNetworkntDetailed (): OutputUnit = networkntSchema.validate(networkntDocument, OutputFormat .LIST )
115125
116126 @Benchmark
117- fun validateNetworkntVerbose (): OutputUnit {
118- return networkntSchema.validate(networkntDocument, OutputFormat .HIERARCHICAL )
119- }
127+ fun validateNetworkntVerbose (): OutputUnit = networkntSchema.validate(networkntDocument, OutputFormat .HIERARCHICAL )
120128
121129 @Benchmark
122- fun validateKmpEmptyCollector (): Boolean {
123- return schema.validate(document, ErrorCollector .EMPTY )
124- }
130+ fun validateKmpEmptyCollector (): Boolean = schema.validate(document, ErrorCollector .EMPTY )
125131
126132 @Benchmark
127133 fun validateKmpCollectErrors (): List <ValidationError > {
@@ -131,17 +137,11 @@ abstract class AbstractComparisonBenchmark {
131137 }
132138
133139 @Benchmark
134- fun validateKmpFlag (): ValidationOutput .Flag {
135- return schema.validate(document, OutputCollector .flag())
136- }
140+ fun validateKmpFlag (): ValidationOutput .Flag = schema.validate(document, OutputCollector .flag())
137141
138142 @Benchmark
139- fun validateKmpDetailed (): ValidationOutput .OutputUnit {
140- return schema.validate(document, OutputCollector .detailed())
141- }
143+ fun validateKmpDetailed (): ValidationOutput .OutputUnit = schema.validate(document, OutputCollector .detailed())
142144
143145 @Benchmark
144- fun validateKmpVerbose (): ValidationOutput .OutputUnit {
145- return schema.validate(document, OutputCollector .verbose())
146- }
146+ fun validateKmpVerbose (): ValidationOutput .OutputUnit = schema.validate(document, OutputCollector .verbose())
147147}
![dependabot[bot]](https://avatars.githubusercontent.com/in/29110?v=4&size=40){kind=avatar}
0 commit comments