Skip to content

Mark additional usage fields as nullable #1836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 9, 2023
Merged

Mark additional usage fields as nullable #1836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .apigentools-info
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"spec_versions": {
"v1": {
"apigentools_version": "1.6.4",
"regenerated": "2023-06-08 21:02:44.638617",
"spec_repo_commit": "5b401dab"
"regenerated": "2023-06-09 14:55:30.022772",
"spec_repo_commit": "b6c7aa0b"
},
"v2": {
"apigentools_version": "1.6.4",
"regenerated": "2023-06-08 21:02:44.654400",
"spec_repo_commit": "5b401dab"
"regenerated": "2023-06-09 14:55:30.037081",
"spec_repo_commit": "b6c7aa0b"
}
}
}
3 changes: 3 additions & 0 deletions .generator/schemas/v1/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16761,6 +16761,7 @@ components:
iot_device_count:
description: The total number of IoT devices during a given hour.
format: int64
nullable: true
type: integer
org_name:
description: The organization name.
Expand Down Expand Up @@ -16888,6 +16889,7 @@ components:
retention:
description: The retention period in days or "custom" for all custom retention
usage.
nullable: true
type: string
type: object
UsageLogsByRetentionResponse:
Expand Down Expand Up @@ -17012,6 +17014,7 @@ components:
host_count:
description: Contains the number of active NPM hosts.
format: int64
nullable: true
type: integer
hour:
description: The hour for the usage.
Expand Down
19 changes: 15 additions & 4 deletions src/main/java/com/datadog/api/client/v1/model/UsageIoTHour.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import java.time.OffsetDateTime;
import java.util.Objects;
import org.openapitools.jackson.nullable.JsonNullable;

/** IoT usage for a given organization for a given hour. */
@JsonPropertyOrder({
Expand All @@ -28,7 +29,7 @@ public class UsageIoTHour {
private OffsetDateTime hour;

public static final String JSON_PROPERTY_IOT_DEVICE_COUNT = "iot_device_count";
private Long iotDeviceCount;
private JsonNullable<Long> iotDeviceCount = JsonNullable.<Long>undefined();

public static final String JSON_PROPERTY_ORG_NAME = "org_name";
private String orgName;
Expand Down Expand Up @@ -58,7 +59,7 @@ public void setHour(OffsetDateTime hour) {
}

public UsageIoTHour iotDeviceCount(Long iotDeviceCount) {
this.iotDeviceCount = iotDeviceCount;
this.iotDeviceCount = JsonNullable.<Long>of(iotDeviceCount);
return this;
}

Expand All @@ -68,16 +69,26 @@ public UsageIoTHour iotDeviceCount(Long iotDeviceCount) {
* @return iotDeviceCount
*/
@jakarta.annotation.Nullable
@JsonIgnore
public Long getIotDeviceCount() {
return iotDeviceCount.orElse(null);
}

@JsonProperty(JSON_PROPERTY_IOT_DEVICE_COUNT)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public Long getIotDeviceCount() {
public JsonNullable<Long> getIotDeviceCount_JsonNullable() {
return iotDeviceCount;
}

public void setIotDeviceCount(Long iotDeviceCount) {
@JsonProperty(JSON_PROPERTY_IOT_DEVICE_COUNT)
public void setIotDeviceCount_JsonNullable(JsonNullable<Long> iotDeviceCount) {
this.iotDeviceCount = iotDeviceCount;
}

public void setIotDeviceCount(Long iotDeviceCount) {
this.iotDeviceCount = JsonNullable.<Long>of(iotDeviceCount);
}

public UsageIoTHour orgName(String orgName) {
this.orgName = orgName;
return this;
Expand Down
18 changes: 14 additions & 4 deletions src/main/java/com/datadog/api/client/v1/model/UsageLogsByRetentionHour.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public class UsageLogsByRetentionHour {
private JsonNullable<Long> rehydratedIndexedEventsCount = JsonNullable.<Long>undefined();

public static final String JSON_PROPERTY_RETENTION = "retention";
private String retention;
private JsonNullable<String> retention = JsonNullable.<String>undefined();

public UsageLogsByRetentionHour indexedEventsCount(Long indexedEventsCount) {
this.indexedEventsCount = JsonNullable.<Long>of(indexedEventsCount);
Expand Down Expand Up @@ -185,7 +185,7 @@ public void setRehydratedIndexedEventsCount(Long rehydratedIndexedEventsCount) {
}

public UsageLogsByRetentionHour retention(String retention) {
this.retention = retention;
this.retention = JsonNullable.<String>of(retention);
return this;
}

Expand All @@ -195,16 +195,26 @@ public UsageLogsByRetentionHour retention(String retention) {
* @return retention
*/
@jakarta.annotation.Nullable
@JsonIgnore
public String getRetention() {
return retention.orElse(null);
}

@JsonProperty(JSON_PROPERTY_RETENTION)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public String getRetention() {
public JsonNullable<String> getRetention_JsonNullable() {
return retention;
}

public void setRetention(String retention) {
@JsonProperty(JSON_PROPERTY_RETENTION)
public void setRetention_JsonNullable(JsonNullable<String> retention) {
this.retention = retention;
}

public void setRetention(String retention) {
this.retention = JsonNullable.<String>of(retention);
}

/** Return true if this UsageLogsByRetentionHour object is equal to o. */
@Override
public boolean equals(Object o) {
Expand Down
19 changes: 15 additions & 4 deletions src/main/java/com/datadog/api/client/v1/model/UsageNetworkHostsHour.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import java.time.OffsetDateTime;
import java.util.Objects;
import org.openapitools.jackson.nullable.JsonNullable;

/** Number of active NPM hosts for each hour for a given organization. */
@JsonPropertyOrder({
Expand All @@ -25,7 +26,7 @@
public class UsageNetworkHostsHour {
@JsonIgnore public boolean unparsed = false;
public static final String JSON_PROPERTY_HOST_COUNT = "host_count";
private Long hostCount;
private JsonNullable<Long> hostCount = JsonNullable.<Long>undefined();

public static final String JSON_PROPERTY_HOUR = "hour";
private OffsetDateTime hour;
Expand All @@ -37,7 +38,7 @@ public class UsageNetworkHostsHour {
private String publicId;

public UsageNetworkHostsHour hostCount(Long hostCount) {
this.hostCount = hostCount;
this.hostCount = JsonNullable.<Long>of(hostCount);
return this;
}

Expand All @@ -47,16 +48,26 @@ public UsageNetworkHostsHour hostCount(Long hostCount) {
* @return hostCount
*/
@jakarta.annotation.Nullable
@JsonIgnore
public Long getHostCount() {
return hostCount.orElse(null);
}

@JsonProperty(JSON_PROPERTY_HOST_COUNT)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public Long getHostCount() {
public JsonNullable<Long> getHostCount_JsonNullable() {
return hostCount;
}

public void setHostCount(Long hostCount) {
@JsonProperty(JSON_PROPERTY_HOST_COUNT)
public void setHostCount_JsonNullable(JsonNullable<Long> hostCount) {
this.hostCount = hostCount;
}

public void setHostCount(Long hostCount) {
this.hostCount = JsonNullable.<Long>of(hostCount);
}

public UsageNetworkHostsHour hour(OffsetDateTime hour) {
this.hour = hour;
return this;
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v1/Validate_API_key_returns_Forbidden_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"timeToLive": {
"unlimited": true
},
"id": "3f83caea-c405-97df-c554-ee2d9f9e4f02"
"id": "3f83caea-c405-97df-c554-ee2d9f9e4f01"
}
]
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v1/Validate_API_key_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"timeToLive": {
"unlimited": true
},
"id": "3f83caea-c405-97df-c554-ee2d9f9e4f01"
"id": "3f83caea-c405-97df-c554-ee2d9f9e4f02"
}
]
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v2/Create_Scanning_Group_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"timeToLive": {
"unlimited": true
},
"id": "01611a93-5e74-0630-3c51-f707c3b51e7a"
"id": "01611a93-5e74-0630-3c51-f707c3b51e80"
},
{
"httpRequest": {
Expand Down
4 changes: 2 additions & 2 deletions ...st/resources/cassettes/features/v2/Create_Scanning_Rule_returns_Bad_Request_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"timeToLive": {
"unlimited": true
},
"id": "01611a93-5e74-0630-3c51-f707c3b51e81"
"id": "01611a93-5e74-0630-3c51-f707c3b51e79"
},
{
"httpRequest": {
Expand Down Expand Up @@ -53,7 +53,7 @@
"timeToLive": {
"unlimited": true
},
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed15f"
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed159"
},
{
"httpRequest": {
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"timeToLive": {
"unlimited": true
},
"id": "01611a93-5e74-0630-3c51-f707c3b51e7c"
"id": "01611a93-5e74-0630-3c51-f707c3b51e7e"
},
{
"httpRequest": {
Expand Down Expand Up @@ -53,7 +53,7 @@
"timeToLive": {
"unlimited": true
},
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed15b"
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed15d"
},
{
"httpRequest": {
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/cassettes/features/v2/Delete_Scanning_Rule_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"timeToLive": {
"unlimited": true
},
"id": "01611a93-5e74-0630-3c51-f707c3b51e7b"
"id": "01611a93-5e74-0630-3c51-f707c3b51e82"
},
{
"httpRequest": {
Expand Down Expand Up @@ -53,7 +53,7 @@
"timeToLive": {
"unlimited": true
},
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed15a"
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed160"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion ...resources/cassettes/features/v2/Delete_a_RUM_application_returns_No_Content_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "74945625-c01a-a598-e538-65a53ceb0685"
"id": "74945625-c01a-a598-e538-65a53ceb0688"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v2/Get_a_RUM_application_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "74945625-c01a-a598-e538-65a53ceb0688"
"id": "74945625-c01a-a598-e538-65a53ceb0686"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v2/Grant_permission_to_a_role_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"timeToLive": {
"unlimited": true
},
"id": "ab2c08c1-60c7-9278-3246-d650bb892170"
"id": "ab2c08c1-60c7-9278-3246-d650bb892174"
},
{
"httpRequest": {
Expand Down
6 changes: 3 additions & 3 deletions src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"timeToLive": {
"unlimited": true
},
"id": "01611a93-5e74-0630-3c51-f707c3b51e7e"
"id": "01611a93-5e74-0630-3c51-f707c3b51e7a"
},
{
"httpRequest": {
Expand Down Expand Up @@ -53,7 +53,7 @@
"timeToLive": {
"unlimited": true
},
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed15d"
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed15a"
},
{
"httpRequest": {
Expand All @@ -79,7 +79,7 @@
"timeToLive": {
"unlimited": true
},
"id": "01611a93-5e74-0630-3c51-f707c3b51e7f"
"id": "01611a93-5e74-0630-3c51-f707c3b51e7b"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion ...st/resources/cassettes/features/v2/List_all_the_RUM_applications_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "74945625-c01a-a598-e538-65a53ceb0687"
"id": "74945625-c01a-a598-e538-65a53ceb0689"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion ...test/resources/cassettes/features/v2/List_permissions_for_a_role_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"timeToLive": {
"unlimited": true
},
"id": "ab2c08c1-60c7-9278-3246-d650bb892172"
"id": "ab2c08c1-60c7-9278-3246-d650bb892175"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v2/List_permissions_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"timeToLive": {
"unlimited": true
},
"id": "ab2c08c1-60c7-9278-3246-d650bb89216e"
"id": "ab2c08c1-60c7-9278-3246-d650bb89216d"
}
]
4 changes: 2 additions & 2 deletions src/test/resources/cassettes/features/v2/Reorder_Groups_returns_Bad_Request_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"timeToLive": {
"unlimited": true
},
"id": "01611a93-5e74-0630-3c51-f707c3b51e79"
"id": "01611a93-5e74-0630-3c51-f707c3b51e7f"
},
{
"httpRequest": {
Expand Down Expand Up @@ -53,7 +53,7 @@
"timeToLive": {
"unlimited": true
},
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed159"
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed15e"
},
{
"httpRequest": {
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/cassettes/features/v2/Reorder_Groups_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"timeToLive": {
"unlimited": true
},
"id": "01611a93-5e74-0630-3c51-f707c3b51e78"
"id": "01611a93-5e74-0630-3c51-f707c3b51e7c"
},
{
"httpRequest": {
Expand Down Expand Up @@ -53,7 +53,7 @@
"timeToLive": {
"unlimited": true
},
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed158"
"id": "33fa4a39-57ef-afdd-007a-0db82f7ed15b"
},
{
"httpRequest": {
Expand Down
Loading