Visitors rework, anyOf allOf oneOf support by Toru8P · Pull Request #23 · th2-net/th2-codec-open-api

Toru8P · 2022-05-23T23:48:40Z

No description provided.

… json object created

…as objects

…chemas for visitors

…an one valid - will be chosen one with unique fields contained refactored some method of visitors, moved to abstract realization removed objectSchema from composed choice, objects can be as Schema<*> as valid one

src/main/kotlin/com/exactpro/th2/codec/openapi/utils/CommonUtils.kt

src/main/kotlin/com/exactpro/th2/codec/openapi/utils/OpenApiUtils.kt

src/main/kotlin/com/exactpro/th2/codec/openapi/writer/SchemaWriter.kt

src/main/kotlin/com/exactpro/th2/codec/openapi/writer/visitors/json/EncodeJsonObjectVisitor.kt

src/main/kotlin/com/exactpro/th2/codec/openapi/writer/visitors/json/DecodeJsonObjectVisitor.kt

cordwelt · 2022-05-27T09:20:59Z

src/main/kotlin/com/exactpro/th2/codec/openapi/OpenApiCodec.kt

+                            })
+                            this.putProperties(METHOD_FIELD, container.method)
+                        }
+                        else -> error("Wrong type of Http Route Container")


You won't need it if you'll make HttpRouteContainer a sealed class

cordwelt · 2022-05-27T09:22:02Z

src/main/kotlin/com/exactpro/th2/codec/openapi/OpenApiCodec.kt

+                        is ResponseContainer -> this.putProperties(CODE_FIELD, container.code)
+                        is RequestContainer -> {
+                            this.putProperties(URI_FIELD, if (container.params.isNotEmpty()) {
+                                container.uriPattern.resolve(container.params, message.getMessage(URI_PARAMS_FIELD).orEmpty().fieldsMap.mapValues { it.value.simpleValue })


message.getMessage(URI_PARAMS_FIELD).orEmpty().fieldsMap.mapValues { it.value.simpleValue }

Extract into utility function?

cordwelt · 2022-05-27T09:53:21Z

src/main/kotlin/com/exactpro/th2/codec/openapi/OpenApiCodec.kt

+                headerMessage[name]?.let { header ->
+                    headers.add(message().apply {
+                        addField("name", name)
+                        addField("value", header.simpleValue)
+                    })
+                } ?: run { if (value.required) error("Header param [$name] is required for ${message.messageType} message") }


Suggested change

headerMessage[name]?.let { header ->

headers.add(message().apply {

addField("name", name)

addField("value", header.simpleValue)

})

} ?: run { if (value.required) error("Header param [$name] is required for ${message.messageType} message") }

headerMessage[name]?.let { header ->

headers += message().apply {

this["name"] = name

this["value"] = header.simpleValue

}

} ?: check(!value.required) {

"Header param [$name] is required for ${message.messageType} message"

}

cordwelt · 2022-05-27T10:03:50Z

src/main/kotlin/com/exactpro/th2/codec/openapi/writer/visitors/SchemaVisitor.kt

+             getFieldNames()
+            schemas.find { schema ->


Suggested change

getFieldNames()

schemas.find { schema ->

getFieldNames().schemas.find { schema ->

cordwelt · 2022-05-27T10:05:25Z

src/main/kotlin/com/exactpro/th2/codec/openapi/writer/visitors/json/DecodeJsonObjectVisitor.kt

-                            SchemaWriter(settings.openAPI).traverse(visitor, itemSchema, throwUndefined)
-                            visitor.rootMessage.build().run(this::add)
-                        }
+                else -> rootMessage[fieldName] = arrayNode.map {


Suggested change

else -> rootMessage[fieldName] = arrayNode.map {

else -> rootMessage[fieldName] = arrayNode.asSequence().map {

cordwelt · 2022-05-27T10:05:42Z

src/main/kotlin/com/exactpro/th2/codec/openapi/writer/visitors/json/DecodeJsonObjectVisitor.kt

+                        visitor.rootMessage
                    }
-                })
+                }


Suggested change

}

}.iterator()

OptimumCode · 2022-05-30T12:36:07Z

src/main/kotlin/com/exactpro/th2/codec/openapi/writer/SchemaWriter.kt

+                            is PasswordSchema, is EmailSchema, is BinarySchema, is ByteArraySchema, is FileSchema, is MapSchema, is UUIDSchema -> throw UnsupportedOperationException("${property::class.simpleName} isn't supported for now")
+                            else -> visitor.visit(name, property, msgStructure.requiredContains(name), checkForUndefinedFields)
+                        }
+                    } ?: error("Schema ${it.name}:${it.type} have no properties to process")


I think we should validate schema during start up if it is not valid state for schema. But if it is a valid state we should not throw an exception

Nikita Shaposhnikov added 22 commits May 18, 2022 13:23

OneOf, AllOf, AnyOf implemented and supports objects

85847d3

decode test added, error fixed

7cb65f2

new reworked visitors update started -> interface reworked and encode…

f520ee8

… json object created

decode json object visitor created

ae36654

test import fixed

73315e7

undefined fields throw

c7fa3b6

array of objects implemented for encode and decode json visitors

b1b5dc2

just first element of array

2946cff

all tests resolved

811ac72

removed validate for type object/array in type field

e8a0207

required null check

96c8114

null or empty for required

aa6f820

try catch on visitor creating to detect which schema throws error

c01b619

isResolveCombinators false by default, all schema<*> will be treated …

0ce5b66

…as objects

not supported schemas exception

50393ad

don't throw on undefined for combined schemas, implemented composed s…

f81edcd

…chemas for visitors

don't throw on undefined for combined schemas, implemented composed s…

b41a8cf

…chemas for visitors

fixed check of type

f9e64ba

check convert of simple type

bae4077

Array supports composed objects schemas in each visitor

9f3f21b

version up and readme updated

310adfd

copyright updated

9ac4d7e

Toru8P self-assigned this May 23, 2022

Nikita Shaposhnikov added 6 commits May 24, 2022 13:28

check null value for primitive on encode

8a3d826

nullValue into empty scheme

fc38368

Date format support, VisitorSettings created

fe34227

null check for json date field

1c711da

date time format support

d5d94d1

Toru8P requested a review from cordwelt May 25, 2022 16:05

Toru8P requested a review from isengrims May 25, 2022 16:05

cordwelt suggested changes May 26, 2022

View reviewed changes

Nikita Shaposhnikov added 3 commits May 27, 2022 11:05

removed header message if encoding message don`t contain headers map

1075f9c

fixed tests for non header cases

f3afd26

review update

f7c8e89

Toru8P requested review from OptimumCode and cordwelt May 27, 2022 09:47

cordwelt suggested changes May 27, 2022

View reviewed changes

Nikita Shaposhnikov added 2 commits May 27, 2022 15:23

fixed timestamp and id

81924e7

fixing null properties

3c7e43c

OptimumCode reviewed May 30, 2022

View reviewed changes

check for undefined oneOf

bfa1efa

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Visitors rework, anyOf allOf oneOf support#23

Visitors rework, anyOf allOf oneOf support#23
Toru8P wants to merge 34 commits intodevfrom
visitor_rework

Toru8P commented May 23, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cordwelt May 27, 2022

Uh oh!

cordwelt May 27, 2022

Uh oh!

cordwelt May 27, 2022

Uh oh!

cordwelt May 27, 2022

Uh oh!

cordwelt May 27, 2022

Uh oh!

cordwelt May 27, 2022

Uh oh!

OptimumCode May 30, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

	getFieldNames()
	schemas.find { schema ->
	getFieldNames().schemas.find { schema ->

	else -> rootMessage[fieldName] = arrayNode.map {
	else -> rootMessage[fieldName] = arrayNode.asSequence().map {

Conversation

Toru8P commented May 23, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cordwelt May 27, 2022

Choose a reason for hiding this comment

Uh oh!

cordwelt May 27, 2022

Choose a reason for hiding this comment

Uh oh!

cordwelt May 27, 2022

Choose a reason for hiding this comment

Uh oh!

cordwelt May 27, 2022

Choose a reason for hiding this comment

Uh oh!

cordwelt May 27, 2022

Choose a reason for hiding this comment

Uh oh!

cordwelt May 27, 2022

Choose a reason for hiding this comment

Uh oh!

OptimumCode May 30, 2022

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants