Skip to content

Commit 11941e0

Browse files
raphael-goetzraphael-goetz
authored
Merge pull request #205 from code0-tech/203-missing-object-rules
Missing `OBJECT` rules
2 parents fa774f6 + 19bc7cb commit 11941e0

9 files changed

Lines changed: 161 additions & 81 deletions

‎definitions/rest/data_type/rest_adapter_input.proto.json‎

Lines changed: 54 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,56 @@
11
{
2-
"variant": "OBJECT",
3-
"identifier": "REST_ADAPTER_INPUT",
4-
"name": [
5-
{
6-
"code": "en-US",
7-
"content": "Rest Adapter Input"
8-
}
9-
],
10-
"alias": [
11-
{
12-
"code": "en-US",
13-
"content": "http;rest;adapter;input"
14-
}
15-
],
16-
"displayMessage": [
17-
{
18-
"code": "en-US",
19-
"content": "Rest Adapter Input"
20-
}
21-
],
22-
"rules": [
23-
{
24-
"containsKey": {
25-
"key": "body",
26-
"dataTypeIdentifier": {
27-
"dataTypeIdentifier": "OBJECT"
28-
}
29-
}
30-
},
31-
{
32-
"containsKey": {
33-
"key": "headers",
34-
"dataTypeIdentifier": {
35-
"dataTypeIdentifier": "REST_HEADER_INPUT"
36-
}
37-
}
38-
},
39-
{
40-
"parentType": {
41-
"parentType": {
42-
"dataTypeIdentifier": "OBJECT"
43-
}
44-
}
45-
}
46-
],
47-
"genericKeys": []
2+
"variant": "OBJECT",
3+
"identifier": "REST_ADAPTER_INPUT",
4+
"name": [
5+
{
6+
"code": "en-US",
7+
"content": "Rest Adapter Input"
8+
}
9+
],
10+
"alias": [
11+
{
12+
"code": "en-US",
13+
"content": "http;rest;adapter;input"
14+
}
15+
],
16+
"displayMessage": [
17+
{
18+
"code": "en-US",
19+
"content": "Rest Adapter Input"
20+
}
21+
],
22+
"rules": [
23+
{
24+
"containsKey": {
25+
"key": "body",
26+
"dataTypeIdentifier": {
27+
"genericType": {
28+
"dataTypeIdentifier": "OBJECT",
29+
"genericMappers": [
30+
{
31+
"source": [
32+
{
33+
"genericKey": "O"
34+
}
35+
],
36+
"target": "T",
37+
"genericCombinations": []
38+
}
39+
]
40+
}
41+
}
42+
}
43+
},
44+
{
45+
"containsKey": {
46+
"key": "headers",
47+
"dataTypeIdentifier": {
48+
"dataTypeIdentifier": "REST_HEADER_INPUT"
49+
}
50+
}
51+
}
52+
],
53+
"genericKeys": [
54+
"O"
55+
]
4856
}

‎definitions/standard/data_type/object/http_header_entry.proto.json‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,6 @@
3535
"dataTypeIdentifier": "TEXT"
3636
}
3737
}
38-
},
39-
{
40-
"parentType": {
41-
"parentType": {
42-
"dataTypeIdentifier": "OBJECT"
43-
}
44-
}
4538
}
4639
],
4740
"genericKeys": []

‎definitions/standard/data_type/object/http_request.proto.json‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,20 @@
4040
"containsKey": {
4141
"key": "body",
4242
"dataTypeIdentifier": {
43-
"dataTypeIdentifier": "OBJECT"
43+
"genericType": {
44+
"dataTypeIdentifier": "OBJECT",
45+
"genericMappers": [
46+
{
47+
"source": [
48+
{
49+
"genericKey": "O"
50+
}
51+
],
52+
"target": "T",
53+
"genericCombinations": []
54+
}
55+
]
56+
}
4457
}
4558
}
4659
},
@@ -51,14 +64,7 @@
5164
"dataTypeIdentifier": "HTTP_HEADER_MAP"
5265
}
5366
}
54-
},
55-
{
56-
"parentType": {
57-
"parentType": {
58-
"dataTypeIdentifier": "OBJECT"
59-
}
60-
}
6167
}
6268
],
63-
"genericKeys": []
69+
"genericKeys": ["O"]
6470
}

‎definitions/standard/data_type/object/http_response.proto.json‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,25 @@
3232
"containsKey": {
3333
"key": "body",
3434
"dataTypeIdentifier": {
35-
"dataTypeIdentifier": "OBJECT"
36-
}
37-
}
38-
},
39-
{
40-
"parentType": {
41-
"parentType": {
42-
"dataTypeIdentifier": "OBJECT"
35+
"genericType": {
36+
"dataTypeIdentifier": "OBJECT",
37+
"genericMappers": [
38+
{
39+
"source": [
40+
{
41+
"genericKey": "O"
42+
}
43+
],
44+
"target": "T",
45+
"genericCombinations": []
46+
}
47+
]
48+
}
4349
}
4450
}
4551
}
4652
],
47-
"genericKeys": []
53+
"genericKeys": [
54+
"O"
55+
]
4856
}

‎definitions/standard/data_type/object/object.proto.json‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,16 @@
1919
"content": "Object"
2020
}
2121
],
22-
"rules": [],
23-
"genericKeys": []
22+
"rules": [
23+
{
24+
"parentType": {
25+
"parentType": {
26+
"genericKey": "T"
27+
}
28+
}
29+
}
30+
],
31+
"genericKeys": [
32+
"T"
33+
]
2434
}

‎definitions/standard/runtime_definition/object/std_object_contains_key.proto.json‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,20 @@
33
"runtimeParameterDefinitions": [
44
{
55
"dataTypeIdentifier": {
6-
"dataTypeIdentifier": "OBJECT"
6+
"genericType": {
7+
"dataTypeIdentifier": "OBJECT",
8+
"genericMappers": [
9+
{
10+
"source": [
11+
{
12+
"genericKey": "O"
13+
}
14+
],
15+
"target": "T",
16+
"genericCombinations": []
17+
}
18+
]
19+
}
720
},
821
"runtimeName": "object",
922
"defaultValue": null,
@@ -46,7 +59,9 @@
4659
"dataTypeIdentifier": "BOOLEAN"
4760
},
4861
"throwsError": false,
49-
"genericKeys": [],
62+
"genericKeys": [
63+
"O"
64+
],
5065
"name": [
5166
{
5267
"code": "en-US",

‎definitions/standard/runtime_definition/object/std_object_keys.proto.json‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,20 @@
33
"runtimeParameterDefinitions": [
44
{
55
"dataTypeIdentifier": {
6-
"dataTypeIdentifier": "OBJECT"
6+
"genericType": {
7+
"dataTypeIdentifier": "OBJECT",
8+
"genericMappers": [
9+
{
10+
"source": [
11+
{
12+
"genericKey": "O"
13+
}
14+
],
15+
"target": "T",
16+
"genericCombinations": []
17+
}
18+
]
19+
}
720
},
821
"runtimeName": "object",
922
"defaultValue": null,
@@ -39,7 +52,7 @@
3952
}
4053
},
4154
"throwsError": false,
42-
"genericKeys": [],
55+
"genericKeys": ["O"],
4356
"name": [
4457
{
4558
"code": "en-US",

‎definitions/standard/runtime_definition/object/std_object_set.proto.json‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,20 @@
33
"runtimeParameterDefinitions": [
44
{
55
"dataTypeIdentifier": {
6-
"dataTypeIdentifier": "OBJECT"
6+
"genericType": {
7+
"dataTypeIdentifier": "OBJECT",
8+
"genericMappers": [
9+
{
10+
"source": [
11+
{
12+
"genericKey": "O"
13+
}
14+
],
15+
"target": "T",
16+
"genericCombinations": []
17+
}
18+
]
19+
}
720
},
821
"runtimeName": "object",
922
"defaultValue": null,
@@ -67,7 +80,8 @@
6780
},
6881
"throwsError": false,
6982
"genericKeys": [
70-
"I"
83+
"I",
84+
"O"
7185
],
7286
"name": [
7387
{

‎definitions/standard/runtime_definition/object/std_object_size.proto.json‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,20 @@
33
"runtimeParameterDefinitions": [
44
{
55
"dataTypeIdentifier": {
6-
"dataTypeIdentifier": "OBJECT"
6+
"genericType": {
7+
"dataTypeIdentifier": "OBJECT",
8+
"genericMappers": [
9+
{
10+
"source": [
11+
{
12+
"genericKey": "O"
13+
}
14+
],
15+
"target": "T",
16+
"genericCombinations": []
17+
}
18+
]
19+
}
720
},
821
"runtimeName": "object",
922
"defaultValue": null,
@@ -26,7 +39,7 @@
2639
"dataTypeIdentifier": "NUMBER"
2740
},
2841
"throwsError": false,
29-
"genericKeys": [],
42+
"genericKeys": ["O"],
3043
"name": [
3144
{
3245
"code": "en-US",

0 commit comments

Comments
 (0)