Skip to content

Commit ff2bdd5

Browse files
api-clients-generation-pipeline[bot]ci.datadog-api-spec
api-clients-generation-pipeline[bot]
and
ci.datadog-api-spec
authored
Fix Org Groups pagination response shape (#3782)
Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com>
1 parent d48174d commit ff2bdd5

8 files changed

Lines changed: 756 additions & 57 deletions

‎.generator/schemas/v2/openapi.yaml‎

Lines changed: 120 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52255,6 +52255,8 @@ components:
5225552255
items:
5225652256
$ref: "#/components/schemas/OrgGroupMembershipData"
5225752257
type: array
52258+
links:
52259+
$ref: "#/components/schemas/OrgGroupPaginationLinks"
5225852260
meta:
5225952261
$ref: "#/components/schemas/OrgGroupPaginationMeta"
5226052262
required:
@@ -52372,6 +52374,8 @@ components:
5237252374
items:
5237352375
$ref: "#/components/schemas/OrgGroupMembershipData"
5237452376
type: array
52377+
links:
52378+
$ref: "#/components/schemas/OrgGroupPaginationLinks"
5237552379
meta:
5237652380
$ref: "#/components/schemas/OrgGroupPaginationMeta"
5237752381
required:
@@ -52472,24 +52476,71 @@ components:
5247252476
required:
5247352477
- data
5247452478
type: object
52479+
OrgGroupPaginationLinks:
52480+
description: Pagination links for navigating between pages of an org group list response.
52481+
properties:
52482+
first:
52483+
description: Link to the first page.
52484+
type: string
52485+
last:
52486+
description: Link to the last page.
52487+
type: string
52488+
next:
52489+
description: Link to the next page.
52490+
nullable: true
52491+
type: string
52492+
prev:
52493+
description: Link to the previous page.
52494+
nullable: true
52495+
type: string
52496+
self:
52497+
description: Link to the current page.
52498+
type: string
52499+
type: object
5247552500
OrgGroupPaginationMeta:
52476-
description: Pagination metadata.
52501+
description: Pagination metadata for org group list responses.
5247752502
properties:
5247852503
page:
5247952504
$ref: "#/components/schemas/OrgGroupPaginationMetaPage"
52480-
required:
52481-
- page
5248252505
type: object
5248352506
OrgGroupPaginationMetaPage:
52484-
description: Page-based pagination details.
52507+
description: Page-based pagination details for org group list responses.
5248552508
properties:
52486-
total_count:
52487-
description: The total number of items.
52488-
example: 42
52509+
first_number:
52510+
description: First page number.
5248952511
format: int64
5249052512
type: integer
52491-
required:
52492-
- total_count
52513+
last_number:
52514+
description: Last page number.
52515+
format: int64
52516+
nullable: true
52517+
type: integer
52518+
next_number:
52519+
description: Next page number.
52520+
format: int64
52521+
nullable: true
52522+
type: integer
52523+
number:
52524+
description: Page number.
52525+
format: int64
52526+
type: integer
52527+
prev_number:
52528+
description: Previous page number.
52529+
format: int64
52530+
nullable: true
52531+
type: integer
52532+
size:
52533+
description: Page size.
52534+
format: int64
52535+
type: integer
52536+
total:
52537+
description: Total number of results.
52538+
format: int64
52539+
type: integer
52540+
type:
52541+
description: Pagination type.
52542+
example: "number_size"
52543+
type: string
5249352544
type: object
5249452545
OrgGroupPolicyAttributes:
5249552546
description: Attributes of an org group policy.
@@ -52679,6 +52730,8 @@ components:
5267952730
items:
5268052731
$ref: "#/components/schemas/OrgGroupPolicyData"
5268152732
type: array
52733+
links:
52734+
$ref: "#/components/schemas/OrgGroupPaginationLinks"
5268252735
meta:
5268352736
$ref: "#/components/schemas/OrgGroupPaginationMeta"
5268452737
required:
@@ -52792,6 +52845,8 @@ components:
5279252845
items:
5279352846
$ref: "#/components/schemas/OrgGroupPolicyOverrideData"
5279452847
type: array
52848+
links:
52849+
$ref: "#/components/schemas/OrgGroupPaginationLinks"
5279552850
meta:
5279652851
$ref: "#/components/schemas/OrgGroupPaginationMeta"
5279752852
required:
@@ -111991,9 +112046,22 @@ paths:
111991112046
id: "a1b2c3d4-e5f6-7890-abcd-ef0123456789"
111992112047
type: org_groups
111993112048
type: org_group_memberships
112049+
links:
112050+
first: "https://api.datadoghq.com/api/v2/org_group_memberships?filter%5Borg_group_id%5D=a1b2c3d4-e5f6-7890-abcd-ef0123456789&page%5Bnumber%5D=0&page%5Bsize%5D=50"
112051+
last: "https://api.datadoghq.com/api/v2/org_group_memberships?filter%5Borg_group_id%5D=a1b2c3d4-e5f6-7890-abcd-ef0123456789&page%5Bnumber%5D=0&page%5Bsize%5D=50"
112052+
next:
112053+
prev:
112054+
self: "https://api.datadoghq.com/api/v2/org_group_memberships?filter%5Borg_group_id%5D=a1b2c3d4-e5f6-7890-abcd-ef0123456789&page%5Bnumber%5D=0&page%5Bsize%5D=50"
111994112055
meta:
111995112056
page:
111996-
total_count: 1
112057+
first_number: 0
112058+
last_number: 0
112059+
next_number:
112060+
number: 0
112061+
prev_number:
112062+
size: 50
112063+
total: 1
112064+
type: number_size
111997112065
schema:
111998112066
$ref: "#/components/schemas/OrgGroupMembershipListResponse"
111999112067
description: OK
@@ -112292,9 +112360,22 @@ paths:
112292112360
id: "a1b2c3d4-e5f6-7890-abcd-ef0123456789"
112293112361
type: org_groups
112294112362
type: org_group_policies
112363+
links:
112364+
first: "https://api.datadoghq.com/api/v2/org_group_policies?filter%5Borg_group_id%5D=a1b2c3d4-e5f6-7890-abcd-ef0123456789&page%5Bnumber%5D=0&page%5Bsize%5D=50"
112365+
last: "https://api.datadoghq.com/api/v2/org_group_policies?filter%5Borg_group_id%5D=a1b2c3d4-e5f6-7890-abcd-ef0123456789&page%5Bnumber%5D=0&page%5Bsize%5D=50"
112366+
next:
112367+
prev:
112368+
self: "https://api.datadoghq.com/api/v2/org_group_policies?filter%5Borg_group_id%5D=a1b2c3d4-e5f6-7890-abcd-ef0123456789&page%5Bnumber%5D=0&page%5Bsize%5D=50"
112295112369
meta:
112296112370
page:
112297-
total_count: 1
112371+
first_number: 0
112372+
last_number: 0
112373+
next_number:
112374+
number: 0
112375+
prev_number:
112376+
size: 50
112377+
total: 1
112378+
type: number_size
112298112379
schema:
112299112380
$ref: "#/components/schemas/OrgGroupPolicyListResponse"
112300112381
description: OK
@@ -112683,9 +112764,22 @@ paths:
112683112764
id: "1a2b3c4d-5e6f-7890-abcd-ef0123456789"
112684112765
type: org_group_policies
112685112766
type: org_group_policy_overrides
112767+
links:
112768+
first: "https://api.datadoghq.com/api/v2/org_group_policy_overrides?filter%5Borg_group_id%5D=a1b2c3d4-e5f6-7890-abcd-ef0123456789&page%5Bnumber%5D=0&page%5Bsize%5D=50"
112769+
last: "https://api.datadoghq.com/api/v2/org_group_policy_overrides?filter%5Borg_group_id%5D=a1b2c3d4-e5f6-7890-abcd-ef0123456789&page%5Bnumber%5D=0&page%5Bsize%5D=50"
112770+
next:
112771+
prev:
112772+
self: "https://api.datadoghq.com/api/v2/org_group_policy_overrides?filter%5Borg_group_id%5D=a1b2c3d4-e5f6-7890-abcd-ef0123456789&page%5Bnumber%5D=0&page%5Bsize%5D=50"
112686112773
meta:
112687112774
page:
112688-
total_count: 1
112775+
first_number: 0
112776+
last_number: 0
112777+
next_number:
112778+
number: 0
112779+
prev_number:
112780+
size: 50
112781+
total: 1
112782+
type: number_size
112689112783
schema:
112690112784
$ref: "#/components/schemas/OrgGroupPolicyOverrideListResponse"
112691112785
description: OK
@@ -113024,9 +113118,22 @@ paths:
113024113118
owner_org_uuid: "b2c3d4e5-f6a7-8901-bcde-f01234567890"
113025113119
id: "a1b2c3d4-e5f6-7890-abcd-ef0123456789"
113026113120
type: org_groups
113121+
links:
113122+
first: "https://api.datadoghq.com/api/v2/org_groups?page%5Bnumber%5D=0&page%5Bsize%5D=50"
113123+
last: "https://api.datadoghq.com/api/v2/org_groups?page%5Bnumber%5D=0&page%5Bsize%5D=50"
113124+
next:
113125+
prev:
113126+
self: "https://api.datadoghq.com/api/v2/org_groups?page%5Bnumber%5D=0&page%5Bsize%5D=50"
113027113127
meta:
113028113128
page:
113029-
total_count: 1
113129+
first_number: 0
113130+
last_number: 0
113131+
next_number:
113132+
number: 0
113133+
prev_number:
113134+
size: 50
113135+
total: 1
113136+
type: number_size
113030113137
schema:
113031113138
$ref: "#/components/schemas/OrgGroupListResponse"
113032113139
description: OK

‎src/main/java/com/datadog/api/client/v2/model/OrgGroupListResponse.java‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
@JsonPropertyOrder({
2424
OrgGroupListResponse.JSON_PROPERTY_DATA,
2525
OrgGroupListResponse.JSON_PROPERTY_INCLUDED,
26+
OrgGroupListResponse.JSON_PROPERTY_LINKS,
2627
OrgGroupListResponse.JSON_PROPERTY_META
2728
})
2829
@jakarta.annotation.Generated(
@@ -35,6 +36,9 @@ public class OrgGroupListResponse {
3536
public static final String JSON_PROPERTY_INCLUDED = "included";
3637
private List<OrgGroupMembershipData> included = null;
3738

39+
public static final String JSON_PROPERTY_LINKS = "links";
40+
private OrgGroupPaginationLinks links;
41+
3842
public static final String JSON_PROPERTY_META = "meta";
3943
private OrgGroupPaginationMeta meta;
4044

@@ -109,14 +113,36 @@ public void setIncluded(List<OrgGroupMembershipData> included) {
109113
this.included = included;
110114
}
111115

116+
public OrgGroupListResponse links(OrgGroupPaginationLinks links) {
117+
this.links = links;
118+
this.unparsed |= links.unparsed;
119+
return this;
120+
}
121+
122+
/**
123+
* Pagination links for navigating between pages of an org group list response.
124+
*
125+
* @return links
126+
*/
127+
@jakarta.annotation.Nullable
128+
@JsonProperty(JSON_PROPERTY_LINKS)
129+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
130+
public OrgGroupPaginationLinks getLinks() {
131+
return links;
132+
}
133+
134+
public void setLinks(OrgGroupPaginationLinks links) {
135+
this.links = links;
136+
}
137+
112138
public OrgGroupListResponse meta(OrgGroupPaginationMeta meta) {
113139
this.meta = meta;
114140
this.unparsed |= meta.unparsed;
115141
return this;
116142
}
117143

118144
/**
119-
* Pagination metadata.
145+
* Pagination metadata for org group list responses.
120146
*
121147
* @return meta
122148
*/
@@ -189,13 +215,14 @@ public boolean equals(Object o) {
189215
OrgGroupListResponse orgGroupListResponse = (OrgGroupListResponse) o;
190216
return Objects.equals(this.data, orgGroupListResponse.data)
191217
&& Objects.equals(this.included, orgGroupListResponse.included)
218+
&& Objects.equals(this.links, orgGroupListResponse.links)
192219
&& Objects.equals(this.meta, orgGroupListResponse.meta)
193220
&& Objects.equals(this.additionalProperties, orgGroupListResponse.additionalProperties);
194221
}
195222

196223
@Override
197224
public int hashCode() {
198-
return Objects.hash(data, included, meta, additionalProperties);
225+
return Objects.hash(data, included, links, meta, additionalProperties);
199226
}
200227

201228
@Override
@@ -204,6 +231,7 @@ public String toString() {
204231
sb.append("class OrgGroupListResponse {\n");
205232
sb.append(" data: ").append(toIndentedString(data)).append("\n");
206233
sb.append(" included: ").append(toIndentedString(included)).append("\n");
234+
sb.append(" links: ").append(toIndentedString(links)).append("\n");
207235
sb.append(" meta: ").append(toIndentedString(meta)).append("\n");
208236
sb.append(" additionalProperties: ")
209237
.append(toIndentedString(additionalProperties))

‎src/main/java/com/datadog/api/client/v2/model/OrgGroupMembershipListResponse.java‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
/** Response containing a list of org group memberships. */
2323
@JsonPropertyOrder({
2424
OrgGroupMembershipListResponse.JSON_PROPERTY_DATA,
25+
OrgGroupMembershipListResponse.JSON_PROPERTY_LINKS,
2526
OrgGroupMembershipListResponse.JSON_PROPERTY_META
2627
})
2728
@jakarta.annotation.Generated(
@@ -31,6 +32,9 @@ public class OrgGroupMembershipListResponse {
3132
public static final String JSON_PROPERTY_DATA = "data";
3233
private List<OrgGroupMembershipData> data = new ArrayList<>();
3334

35+
public static final String JSON_PROPERTY_LINKS = "links";
36+
private OrgGroupPaginationLinks links;
37+
3438
public static final String JSON_PROPERTY_META = "meta";
3539
private OrgGroupPaginationMeta meta;
3640

@@ -72,14 +76,36 @@ public void setData(List<OrgGroupMembershipData> data) {
7276
this.data = data;
7377
}
7478

79+
public OrgGroupMembershipListResponse links(OrgGroupPaginationLinks links) {
80+
this.links = links;
81+
this.unparsed |= links.unparsed;
82+
return this;
83+
}
84+
85+
/**
86+
* Pagination links for navigating between pages of an org group list response.
87+
*
88+
* @return links
89+
*/
90+
@jakarta.annotation.Nullable
91+
@JsonProperty(JSON_PROPERTY_LINKS)
92+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
93+
public OrgGroupPaginationLinks getLinks() {
94+
return links;
95+
}
96+
97+
public void setLinks(OrgGroupPaginationLinks links) {
98+
this.links = links;
99+
}
100+
75101
public OrgGroupMembershipListResponse meta(OrgGroupPaginationMeta meta) {
76102
this.meta = meta;
77103
this.unparsed |= meta.unparsed;
78104
return this;
79105
}
80106

81107
/**
82-
* Pagination metadata.
108+
* Pagination metadata for org group list responses.
83109
*
84110
* @return meta
85111
*/
@@ -152,21 +178,23 @@ public boolean equals(Object o) {
152178
OrgGroupMembershipListResponse orgGroupMembershipListResponse =
153179
(OrgGroupMembershipListResponse) o;
154180
return Objects.equals(this.data, orgGroupMembershipListResponse.data)
181+
&& Objects.equals(this.links, orgGroupMembershipListResponse.links)
155182
&& Objects.equals(this.meta, orgGroupMembershipListResponse.meta)
156183
&& Objects.equals(
157184
this.additionalProperties, orgGroupMembershipListResponse.additionalProperties);
158185
}
159186

160187
@Override
161188
public int hashCode() {
162-
return Objects.hash(data, meta, additionalProperties);
189+
return Objects.hash(data, links, meta, additionalProperties);
163190
}
164191

165192
@Override
166193
public String toString() {
167194
StringBuilder sb = new StringBuilder();
168195
sb.append("class OrgGroupMembershipListResponse {\n");
169196
sb.append(" data: ").append(toIndentedString(data)).append("\n");
197+
sb.append(" links: ").append(toIndentedString(links)).append("\n");
170198
sb.append(" meta: ").append(toIndentedString(meta)).append("\n");
171199
sb.append(" additionalProperties: ")
172200
.append(toIndentedString(additionalProperties))

0 commit comments

Comments
 (0)