Skip to content

Commit 78d7123

Browse files
committed
Updated: KV removed from message properties header
1 parent ab552a8 commit 78d7123

File tree

3 files changed

+136
-83
lines changed

3 files changed

+136
-83
lines changed

generator.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,16 @@ generate_aspnetcore() {
2020
cat <<EOT >> $CONFIG_FILE
2121
{
2222
"packageName" : "$PACKAGE_NETCORE",
23-
"packageVersion": "1.0.2",
23+
"packageVersion": "1.0.3",
2424
"targetFramework": "netcoreapp2.0",
2525
"hideGenerationTimestamp": true,
2626
"sortParamsByRequiredFlag": true,
2727
"useDateTimeOffset": true,
2828
"useCollection": true,
2929
"returnICollection": true,
3030
"netCoreProjectFile": true,
31-
"validatable": true
31+
"validatable": true,
32+
"optionalAssemblyInfo" : true
3233
}
3334
EOT
3435

rabbitmq.3.7.1.oas2.json

Lines changed: 77 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -842,31 +842,16 @@
842842
},
843843
"x-examples": {
844844
"application/json": {
845+
"routing_key": "shared.key",
846+
"payload": "This is the payload",
847+
"payload_encoding": "string",
845848
"properties": {
846-
"application_id": "et labore incididunt dol",
847-
"correlation_id": "ut Excepteur aliquip ex pariatur",
848-
"message_id": "quis",
849-
"user_id": "quis",
850-
"timestamp": 47703331,
851-
"content_type": "id tempor labore anim",
852-
"delivery_mode": -12066292,
853-
"priority": 55798254,
854-
"cluster_id": "voluptate deserunt",
855-
"headers": [
856-
{
857-
"name": "reprehenderit labore"
858-
},
859-
{
860-
"name": "ea pariatur mollit fugiat labore"
861-
},
862-
{
863-
"name": "qui nostrud enim"
864-
}
865-
]
866-
},
867-
"routing_key": "magna",
868-
"payload": "anim",
869-
"payload_encoding": "et"
849+
"app_id": "ApplicationId",
850+
"correlation_id": "CorrelationId",
851+
"message_id": "MessageId",
852+
"user_id": "testuser",
853+
"delivery_mode": 2
854+
}
870855
}
871856
}
872857
}
@@ -3741,19 +3726,11 @@
37413726
},
37423727
"title": "PublishResponse"
37433728
},
3744-
"MessageHeader": {
3745-
"type": "object",
3746-
"properties": {
3747-
"name": {
3748-
"type": "string"
3749-
}
3750-
},
3751-
"title": "MessageHeader"
3752-
},
37533729
"MessageProperties": {
37543730
"type": "object",
3731+
"title": "MessageProperties",
37553732
"properties": {
3756-
"application_id": {
3733+
"app_id": {
37573734
"type": "string"
37583735
},
37593736
"correlation_id": {
@@ -3772,22 +3749,16 @@
37723749
"type": "string"
37733750
},
37743751
"delivery_mode": {
3775-
"type": "integer"
3752+
"type": "integer",
3753+
"description": "1 = Non Persistent, 2 = Persistent"
37763754
},
37773755
"priority": {
37783756
"type": "integer"
37793757
},
37803758
"cluster_id": {
37813759
"type": "string"
3782-
},
3783-
"headers": {
3784-
"type": "array",
3785-
"items": {
3786-
"$ref": "#/definitions/MessageHeader"
3787-
}
37883760
}
3789-
},
3790-
"title": "MessageProperties"
3761+
}
37913762
},
37923763
"PublishRequest": {
37933764
"type": "object",
@@ -3800,12 +3771,22 @@
38003771
"type": "string"
38013772
},
38023773
"payload_encoding": {
3803-
"type": "string"
3774+
"type": "string",
3775+
"enum": [
3776+
"string",
3777+
"base64"
3778+
],
3779+
"default": "string"
38043780
},
38053781
"properties": {
3806-
"$ref": "#/definitions/MessageProperties"
3782+
"$ref": "#/definitions/PublishProperties"
38073783
}
3808-
}
3784+
},
3785+
"required": [
3786+
"routing_key",
3787+
"payload",
3788+
"payload_encoding"
3789+
]
38093790
},
38103791
"ExchangeRequest": {
38113792
"type": "object",
@@ -3907,21 +3888,43 @@
39073888
},
39083889
"ConsumeRequest": {
39093890
"type": "object",
3891+
"title": "ConsumeRequest",
39103892
"properties": {
39113893
"count": {
3912-
"type": "integer"
3894+
"type": "integer",
3895+
"default": 1,
3896+
"minimum": 0
39133897
},
39143898
"ackmode": {
3915-
"type": "string"
3899+
"type": "string",
3900+
"enum": [
3901+
"ack_requeue_true",
3902+
"ack_requeue_false"
3903+
],
3904+
"default": "ack_requeue_false"
39163905
},
39173906
"encoding": {
3918-
"type": "string"
3907+
"type": "string",
3908+
"default": "string",
3909+
"enum": [
3910+
"string",
3911+
"base64",
3912+
"auto"
3913+
]
39193914
},
39203915
"truncate": {
3921-
"type": "integer"
3916+
"type": "integer",
3917+
"minimum": 0,
3918+
"maximum": 5000000,
3919+
"default": 1000000
39223920
}
39233921
},
3924-
"title": "ConsumeRequest"
3922+
"required": [
3923+
"count",
3924+
"ackmode",
3925+
"encoding",
3926+
"truncate"
3927+
]
39253928
},
39263929
"QueueAction": {
39273930
"type": "object",
@@ -3938,6 +3941,29 @@
39383941
}
39393942
},
39403943
"title": "QueueAction"
3944+
},
3945+
"PublishProperties": {
3946+
"type": "object",
3947+
"title": "PublishProperties",
3948+
"properties": {
3949+
"app_id": {
3950+
"type": "string"
3951+
},
3952+
"correlation_id": {
3953+
"type": "string"
3954+
},
3955+
"message_id": {
3956+
"type": "string"
3957+
},
3958+
"user_id": {
3959+
"type": "string"
3960+
},
3961+
"delivery_mode": {
3962+
"type": "integer",
3963+
"description": "1 = Non Persistent, 2 = Persistent",
3964+
"default": 2
3965+
}
3966+
}
39413967
}
39423968
},
39433969
"basePath": "/rabbitmq/api",

rabbitmq.3.7.1.oas2.yaml

Lines changed: 56 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -562,23 +562,15 @@ paths:
562562
"$ref": "#/definitions/PublishRequest"
563563
x-examples:
564564
application/json:
565+
routing_key: shared.key
566+
payload: This is the payload
567+
payload_encoding: string
565568
properties:
566-
application_id: et labore incididunt dol
567-
correlation_id: ut Excepteur aliquip ex pariatur
568-
message_id: quis
569-
user_id: quis
570-
timestamp: 47703331
571-
content_type: id tempor labore anim
572-
delivery_mode: -12066292
573-
priority: 55798254
574-
cluster_id: voluptate deserunt
575-
headers:
576-
- name: reprehenderit labore
577-
- name: ea pariatur mollit fugiat labore
578-
- name: qui nostrud enim
579-
routing_key: magna
580-
payload: anim
581-
payload_encoding: et
569+
app_id: ApplicationId
570+
correlation_id: CorrelationId
571+
message_id: MessageId
572+
user_id: testuser
573+
delivery_mode: 2
582574
responses:
583575
'200':
584576
description: ''
@@ -2462,16 +2454,11 @@ definitions:
24622454
routed:
24632455
type: boolean
24642456
title: PublishResponse
2465-
MessageHeader:
2466-
type: object
2467-
properties:
2468-
name:
2469-
type: string
2470-
title: MessageHeader
24712457
MessageProperties:
24722458
type: object
2459+
title: MessageProperties
24732460
properties:
2474-
application_id:
2461+
app_id:
24752462
type: string
24762463
correlation_id:
24772464
type: string
@@ -2485,15 +2472,11 @@ definitions:
24852472
type: string
24862473
delivery_mode:
24872474
type: integer
2475+
description: 1 = Non Persistent, 2 = Persistent
24882476
priority:
24892477
type: integer
24902478
cluster_id:
24912479
type: string
2492-
headers:
2493-
type: array
2494-
items:
2495-
"$ref": "#/definitions/MessageHeader"
2496-
title: MessageProperties
24972480
PublishRequest:
24982481
type: object
24992482
title: PublishRequest
@@ -2504,8 +2487,16 @@ definitions:
25042487
type: string
25052488
payload_encoding:
25062489
type: string
2490+
enum:
2491+
- string
2492+
- base64
2493+
default: string
25072494
properties:
2508-
"$ref": "#/definitions/MessageProperties"
2495+
"$ref": "#/definitions/PublishProperties"
2496+
required:
2497+
- routing_key
2498+
- payload
2499+
- payload_encoding
25092500
ExchangeRequest:
25102501
type: object
25112502
title: ExchangeRequest
@@ -2573,16 +2564,35 @@ definitions:
25732564
type: string
25742565
ConsumeRequest:
25752566
type: object
2567+
title: ConsumeRequest
25762568
properties:
25772569
count:
25782570
type: integer
2571+
default: 1
2572+
minimum: 0
25792573
ackmode:
25802574
type: string
2575+
enum:
2576+
- ack_requeue_true
2577+
- ack_requeue_false
2578+
default: ack_requeue_false
25812579
encoding:
25822580
type: string
2581+
default: string
2582+
enum:
2583+
- string
2584+
- base64
2585+
- auto
25832586
truncate:
25842587
type: integer
2585-
title: ConsumeRequest
2588+
minimum: 0
2589+
maximum: 5000000
2590+
default: 1000000
2591+
required:
2592+
- count
2593+
- ackmode
2594+
- encoding
2595+
- truncate
25862596
QueueAction:
25872597
type: object
25882598
required:
@@ -2594,6 +2604,22 @@ definitions:
25942604
- sync
25952605
- cancel_sync
25962606
title: QueueAction
2607+
PublishProperties:
2608+
type: object
2609+
title: PublishProperties
2610+
properties:
2611+
app_id:
2612+
type: string
2613+
correlation_id:
2614+
type: string
2615+
message_id:
2616+
type: string
2617+
user_id:
2618+
type: string
2619+
delivery_mode:
2620+
type: integer
2621+
description: 1 = Non Persistent, 2 = Persistent
2622+
default: 2
25972623
basePath: "/rabbitmq/api"
25982624
produces:
25992625
- application/json

0 commit comments

Comments
 (0)