Skip to content
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.

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

Fix paging parameter names for logs aggregate queries #628

Merged
merged 1 commit into from
Jan 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"spec_versions": {
"v1": {
"apigentools_version": "1.4.1.dev2",
"regenerated": "2021-01-26 17:15:19.292638",
"spec_repo_commit": "db8c9ba"
"regenerated": "2021-01-28 16:02:59.034976",
"spec_repo_commit": "c2cedbf"
},
"v2": {
"apigentools_version": "1.4.1.dev2",
"regenerated": "2021-01-26 17:15:29.841979",
"spec_repo_commit": "db8c9ba"
"regenerated": "2021-01-28 16:03:09.473410",
"spec_repo_commit": "c2cedbf"
}
}
}
6 changes: 3 additions & 3 deletions .openapi-generator/FILES
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ docs/LogsAggregateBucketValue.md
docs/LogsAggregateBucketValueTimeseries.md
docs/LogsAggregateBucketValueTimeseriesPoint.md
docs/LogsAggregateRequest.md
docs/LogsAggregateRequestPaging.md
docs/LogsAggregateRequestPage.md
docs/LogsAggregateResponse.md
docs/LogsAggregateResponseData.md
docs/LogsAggregateResponseStatus.md
Expand Down Expand Up @@ -428,7 +428,7 @@ src/main/java/com/datadog/api/v2/client/model/LogsAggregateBucketValue.java
src/main/java/com/datadog/api/v2/client/model/LogsAggregateBucketValueTimeseries.java
src/main/java/com/datadog/api/v2/client/model/LogsAggregateBucketValueTimeseriesPoint.java
src/main/java/com/datadog/api/v2/client/model/LogsAggregateRequest.java
src/main/java/com/datadog/api/v2/client/model/LogsAggregateRequestPaging.java
src/main/java/com/datadog/api/v2/client/model/LogsAggregateRequestPage.java
src/main/java/com/datadog/api/v2/client/model/LogsAggregateResponse.java
src/main/java/com/datadog/api/v2/client/model/LogsAggregateResponseData.java
src/main/java/com/datadog/api/v2/client/model/LogsAggregateResponseStatus.java
Expand Down Expand Up @@ -700,7 +700,7 @@ src/test/java/com/datadog/api/v2/client/model/LogsAggregateBucketTest.java
src/test/java/com/datadog/api/v2/client/model/LogsAggregateBucketValueTest.java
src/test/java/com/datadog/api/v2/client/model/LogsAggregateBucketValueTimeseriesPointTest.java
src/test/java/com/datadog/api/v2/client/model/LogsAggregateBucketValueTimeseriesTest.java
src/test/java/com/datadog/api/v2/client/model/LogsAggregateRequestPagingTest.java
src/test/java/com/datadog/api/v2/client/model/LogsAggregateRequestPageTest.java
src/test/java/com/datadog/api/v2/client/model/LogsAggregateRequestTest.java
src/test/java/com/datadog/api/v2/client/model/LogsAggregateResponseDataTest.java
src/test/java/com/datadog/api/v2/client/model/LogsAggregateResponseStatusTest.java
Expand Down
14 changes: 7 additions & 7 deletions api/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7243,8 +7243,8 @@ components:
aggregation: count
order: asc
facet: host
paging:
after: eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==
page:
cursor: eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==
properties:
compute:
description: The list of metrics or timeseries to compute for the retrieved
Expand All @@ -7261,8 +7261,8 @@ components:
type: array
options:
$ref: '#/components/schemas/LogsQueryOptions'
paging:
$ref: '#/components/schemas/LogsAggregateRequest_paging'
page:
$ref: '#/components/schemas/LogsAggregateRequest_page'
type: object
LogsAggregateResponse:
description: The response object for the logs aggregate API endpoint
Expand Down Expand Up @@ -10851,12 +10851,12 @@ components:
format: date-time
type: string
type: object
LogsAggregateRequest_paging:
LogsAggregateRequest_page:
description: Paging settings
example:
after: eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==
cursor: eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==
properties:
after:
cursor:
description: The returned paging point to use to get the next results
example: eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==
type: string
Expand Down
2 changes: 1 addition & 1 deletion api_docs/v2/LogsAggregateRequest.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Name | Type | Description | Notes
**filter** | [**LogsQueryFilter**](LogsQueryFilter.md) | | [optional]
**groupBy** | [**List<LogsGroupBy>**](LogsGroupBy.md) | The rules for the group by | [optional]
**options** | [**LogsQueryOptions**](LogsQueryOptions.md) | | [optional]
**paging** | [**LogsAggregateRequestPaging**](LogsAggregateRequestPaging.md) | | [optional]
**page** | [**LogsAggregateRequestPage**](LogsAggregateRequestPage.md) | | [optional]



Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@


# LogsAggregateRequestPaging
# LogsAggregateRequestPage

Paging settings
## Properties

Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**after** | **String** | The returned paging point to use to get the next results | [optional]
**cursor** | **String** | The returned paging point to use to get the next results | [optional]



2 changes: 1 addition & 1 deletion api_docs/v2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ Class | Method | HTTP request | Description
- [LogsAggregateBucketValueTimeseries](LogsAggregateBucketValueTimeseries.md)
- [LogsAggregateBucketValueTimeseriesPoint](LogsAggregateBucketValueTimeseriesPoint.md)
- [LogsAggregateRequest](LogsAggregateRequest.md)
- [LogsAggregateRequestPaging](LogsAggregateRequestPaging.md)
- [LogsAggregateRequestPage](LogsAggregateRequestPage.md)
- [LogsAggregateResponse](LogsAggregateResponse.md)
- [LogsAggregateResponseData](LogsAggregateResponseData.md)
- [LogsAggregateResponseStatus](LogsAggregateResponseStatus.md)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import java.util.Arrays;
import java.util.Map;
import java.util.HashMap;
import com.datadog.api.v2.client.model.LogsAggregateRequestPaging;
import com.datadog.api.v2.client.model.LogsAggregateRequestPage;
import com.datadog.api.v2.client.model.LogsCompute;
import com.datadog.api.v2.client.model.LogsGroupBy;
import com.datadog.api.v2.client.model.LogsQueryFilter;
Expand All @@ -42,7 +42,7 @@
LogsAggregateRequest.JSON_PROPERTY_FILTER,
LogsAggregateRequest.JSON_PROPERTY_GROUP_BY,
LogsAggregateRequest.JSON_PROPERTY_OPTIONS,
LogsAggregateRequest.JSON_PROPERTY_PAGING
LogsAggregateRequest.JSON_PROPERTY_PAGE
})
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class LogsAggregateRequest {
Expand All @@ -58,8 +58,8 @@ public class LogsAggregateRequest {
public static final String JSON_PROPERTY_OPTIONS = "options";
private LogsQueryOptions options;

public static final String JSON_PROPERTY_PAGING = "paging";
private LogsAggregateRequestPaging paging;
public static final String JSON_PROPERTY_PAGE = "page";
private LogsAggregateRequestPage page;


public LogsAggregateRequest compute(List<LogsCompute> compute) {
Expand Down Expand Up @@ -174,27 +174,27 @@ public void setOptions(LogsQueryOptions options) {
}


public LogsAggregateRequest paging(LogsAggregateRequestPaging paging) {
this.paging = paging;
public LogsAggregateRequest page(LogsAggregateRequestPage page) {
this.page = page;
return this;
}

/**
* Get paging
* @return paging
* Get page
* @return page
**/
@javax.annotation.Nullable
@ApiModelProperty(value = "")
@JsonProperty(JSON_PROPERTY_PAGING)
@JsonProperty(JSON_PROPERTY_PAGE)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)

public LogsAggregateRequestPaging getPaging() {
return paging;
public LogsAggregateRequestPage getPage() {
return page;
}


public void setPaging(LogsAggregateRequestPaging paging) {
this.paging = paging;
public void setPage(LogsAggregateRequestPage page) {
this.page = page;
}


Expand All @@ -214,12 +214,12 @@ public boolean equals(Object o) {
Objects.equals(this.filter, logsAggregateRequest.filter) &&
Objects.equals(this.groupBy, logsAggregateRequest.groupBy) &&
Objects.equals(this.options, logsAggregateRequest.options) &&
Objects.equals(this.paging, logsAggregateRequest.paging);
Objects.equals(this.page, logsAggregateRequest.page);
}

@Override
public int hashCode() {
return Objects.hash(compute, filter, groupBy, options, paging);
return Objects.hash(compute, filter, groupBy, options, page);
}


Expand All @@ -231,7 +231,7 @@ public String toString() {
sb.append(" filter: ").append(toIndentedString(filter)).append("\n");
sb.append(" groupBy: ").append(toIndentedString(groupBy)).append("\n");
sb.append(" options: ").append(toIndentedString(options)).append("\n");
sb.append(" paging: ").append(toIndentedString(paging)).append("\n");
sb.append(" page: ").append(toIndentedString(page)).append("\n");
sb.append("}");
return sb.toString();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,40 +31,40 @@
*/
@ApiModel(description = "Paging settings")
@JsonPropertyOrder({
LogsAggregateRequestPaging.JSON_PROPERTY_AFTER
LogsAggregateRequestPage.JSON_PROPERTY_CURSOR
})
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class LogsAggregateRequestPaging {
public static final String JSON_PROPERTY_AFTER = "after";
private String after;
public class LogsAggregateRequestPage {
public static final String JSON_PROPERTY_CURSOR = "cursor";
private String cursor;


public LogsAggregateRequestPaging after(String after) {
this.after = after;
public LogsAggregateRequestPage cursor(String cursor) {
this.cursor = cursor;
return this;
}

/**
* The returned paging point to use to get the next results
* @return after
* @return cursor
**/
@javax.annotation.Nullable
@ApiModelProperty(example = "eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==", value = "The returned paging point to use to get the next results")
@JsonProperty(JSON_PROPERTY_AFTER)
@JsonProperty(JSON_PROPERTY_CURSOR)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)

public String getAfter() {
return after;
public String getCursor() {
return cursor;
}


public void setAfter(String after) {
this.after = after;
public void setCursor(String cursor) {
this.cursor = cursor;
}


/**
* Return true if this LogsAggregateRequest_paging object is equal to o.
* Return true if this LogsAggregateRequest_page object is equal to o.
*/
@Override
public boolean equals(Object o) {
Expand All @@ -74,21 +74,21 @@ public boolean equals(Object o) {
if (o == null || getClass() != o.getClass()) {
return false;
}
LogsAggregateRequestPaging logsAggregateRequestPaging = (LogsAggregateRequestPaging) o;
return Objects.equals(this.after, logsAggregateRequestPaging.after);
LogsAggregateRequestPage logsAggregateRequestPage = (LogsAggregateRequestPage) o;
return Objects.equals(this.cursor, logsAggregateRequestPage.cursor);
}

@Override
public int hashCode() {
return Objects.hash(after);
return Objects.hash(cursor);
}


@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class LogsAggregateRequestPaging {\n");
sb.append(" after: ").append(toIndentedString(after)).append("\n");
sb.append("class LogsAggregateRequestPage {\n");
sb.append(" cursor: ").append(toIndentedString(cursor)).append("\n");
sb.append("}");
return sb.toString();
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/datadog/api/v2/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1917,10 +1917,10 @@ components:
type: array
options:
$ref: '#/components/schemas/LogsQueryOptions'
paging:
page:
description: Paging settings
properties:
after:
cursor:
description: The returned paging point to use to get the next results
example: eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==
type: string
Expand Down