Skip to content

Make value be oneOf number or string #2543

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
Oct 31, 2024
Merged

Make value be oneOf number or string #2543

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.6",
"regenerated": "2024-10-31 14:19:53.013748",
"spec_repo_commit": "47da2e01"
"regenerated": "2024-10-31 14:51:17.263736",
"spec_repo_commit": "e9cc5e6a"
},
"v2": {
"apigentools_version": "1.6.6",
"regenerated": "2024-10-31 14:19:53.032374",
"spec_repo_commit": "47da2e01"
"regenerated": "2024-10-31 14:51:17.282523",
"spec_repo_commit": "e9cc5e6a"
}
}
}
41 changes: 26 additions & 15 deletions .generator/schemas/v1/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15530,7 +15530,7 @@ components:
$ref: '#/components/schemas/SyntheticsMobileStepParamsDirection'
element:
$ref: '#/components/schemas/SyntheticsMobileStepParamsElement'
enable:
enabled:
description: Boolean to change the state of the wifi for a `toggleWiFi`
step type.
type: boolean
Expand All @@ -15546,8 +15546,7 @@ components:
step type.
type: string
value:
description: Values used in the step. Used in multiple step types.
type: string
$ref: '#/components/schemas/SyntheticsMobileStepParamsValue'
variable:
$ref: '#/components/schemas/SyntheticsMobileStepParamsVariable'
withEnter:
Expand All @@ -15556,12 +15555,12 @@ components:
type: boolean
x:
description: Amount to scroll by on the `x` axis for a `scroll` step type.
format: int64
type: integer
format: double
type: number
y:
description: Amount to scroll by on the `y` axis for a `scroll` step type.
format: int64
type: integer
format: double
type: number
type: object
SyntheticsMobileStepParamsDirection:
description: The direction of the scroll for a `scrollToElement` step type.
Expand Down Expand Up @@ -15615,12 +15614,12 @@ components:
properties:
x:
description: The `relativePosition` on the `x` axis for the element.
format: int64
type: integer
format: double
type: number
y:
description: The `relativePosition` on the `y` axis for the element.
format: int64
type: integer
format: double
type: number
type: object
SyntheticsMobileStepParamsElementUserLocator:
description: User locator to find the element.
Expand Down Expand Up @@ -15670,13 +15669,25 @@ components:
properties:
x:
description: The `x` position for the flick.
format: int64
type: integer
format: double
type: number
y:
description: The `y` position for the flick.
format: int64
type: integer
format: double
type: number
type: object
SyntheticsMobileStepParamsValue:
description: Values used in the step for in multiple step types.
oneOf:
- $ref: '#/components/schemas/SyntheticsMobileStepParamsValueString'
- $ref: '#/components/schemas/SyntheticsMobileStepParamsValueNumber'
SyntheticsMobileStepParamsValueNumber:
description: Value used in the step for in multiple step types.
format: int64
type: integer
SyntheticsMobileStepParamsValueString:
description: Value used in the step for in multiple step types.
type: string
SyntheticsMobileStepParamsVariable:
description: Variable object for `extractVariable` step type.
properties:
Expand Down
55 changes: 28 additions & 27 deletions src/main/java/com/datadog/api/client/v1/model/SyntheticsMobileStepParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
SyntheticsMobileStepParams.JSON_PROPERTY_DELAY,
SyntheticsMobileStepParams.JSON_PROPERTY_DIRECTION,
SyntheticsMobileStepParams.JSON_PROPERTY_ELEMENT,
SyntheticsMobileStepParams.JSON_PROPERTY_ENABLE,
SyntheticsMobileStepParams.JSON_PROPERTY_ENABLED,
SyntheticsMobileStepParams.JSON_PROPERTY_MAX_SCROLLS,
SyntheticsMobileStepParams.JSON_PROPERTY_POSITIONS,
SyntheticsMobileStepParams.JSON_PROPERTY_SUBTEST_PUBLIC_ID,
Expand All @@ -50,8 +50,8 @@ public class SyntheticsMobileStepParams {
public static final String JSON_PROPERTY_ELEMENT = "element";
private SyntheticsMobileStepParamsElement element;

public static final String JSON_PROPERTY_ENABLE = "enable";
private Boolean enable;
public static final String JSON_PROPERTY_ENABLED = "enabled";
private Boolean enabled;

public static final String JSON_PROPERTY_MAX_SCROLLS = "maxScrolls";
private Long maxScrolls;
Expand All @@ -63,7 +63,7 @@ public class SyntheticsMobileStepParams {
private String subtestPublicId;

public static final String JSON_PROPERTY_VALUE = "value";
private String value;
private SyntheticsMobileStepParamsValue value;

public static final String JSON_PROPERTY_VARIABLE = "variable";
private SyntheticsMobileStepParamsVariable variable;
Expand All @@ -72,10 +72,10 @@ public class SyntheticsMobileStepParams {
private Boolean withEnter;

public static final String JSON_PROPERTY_X = "x";
private Long x;
private Double x;

public static final String JSON_PROPERTY_Y = "y";
private Long y;
private Double y;

public SyntheticsMobileStepParams check(SyntheticsCheckType check) {
this.check = check;
Expand Down Expand Up @@ -171,25 +171,25 @@ public void setElement(SyntheticsMobileStepParamsElement element) {
this.element = element;
}

public SyntheticsMobileStepParams enable(Boolean enable) {
this.enable = enable;
public SyntheticsMobileStepParams enabled(Boolean enabled) {
this.enabled = enabled;
return this;
}

/**
* Boolean to change the state of the wifi for a <code>toggleWiFi</code> step type.
*
* @return enable
* @return enabled
*/
@jakarta.annotation.Nullable
@JsonProperty(JSON_PROPERTY_ENABLE)
@JsonProperty(JSON_PROPERTY_ENABLED)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public Boolean getEnable() {
return enable;
public Boolean getEnabled() {
return enabled;
}

public void setEnable(Boolean enable) {
this.enable = enable;
public void setEnabled(Boolean enabled) {
this.enabled = enabled;
}

public SyntheticsMobileStepParams maxScrolls(Long maxScrolls) {
Expand Down Expand Up @@ -269,24 +269,25 @@ public void setSubtestPublicId(String subtestPublicId) {
this.subtestPublicId = subtestPublicId;
}

public SyntheticsMobileStepParams value(String value) {
public SyntheticsMobileStepParams value(SyntheticsMobileStepParamsValue value) {
this.value = value;
this.unparsed |= value.unparsed;
return this;
}

/**
* Values used in the step. Used in multiple step types.
* Values used in the step for in multiple step types.
*
* @return value
*/
@jakarta.annotation.Nullable
@JsonProperty(JSON_PROPERTY_VALUE)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public String getValue() {
public SyntheticsMobileStepParamsValue getValue() {
return value;
}

public void setValue(String value) {
public void setValue(SyntheticsMobileStepParamsValue value) {
this.value = value;
}

Expand Down Expand Up @@ -334,7 +335,7 @@ public void setWithEnter(Boolean withEnter) {
this.withEnter = withEnter;
}

public SyntheticsMobileStepParams x(Long x) {
public SyntheticsMobileStepParams x(Double x) {
this.x = x;
return this;
}
Expand All @@ -347,15 +348,15 @@ public SyntheticsMobileStepParams x(Long x) {
@jakarta.annotation.Nullable
@JsonProperty(JSON_PROPERTY_X)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public Long getX() {
public Double getX() {
return x;
}

public void setX(Long x) {
public void setX(Double x) {
this.x = x;
}

public SyntheticsMobileStepParams y(Long y) {
public SyntheticsMobileStepParams y(Double y) {
this.y = y;
return this;
}
Expand All @@ -368,11 +369,11 @@ public SyntheticsMobileStepParams y(Long y) {
@jakarta.annotation.Nullable
@JsonProperty(JSON_PROPERTY_Y)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public Long getY() {
public Double getY() {
return y;
}

public void setY(Long y) {
public void setY(Double y) {
this.y = y;
}

Expand Down Expand Up @@ -436,7 +437,7 @@ public boolean equals(Object o) {
&& Objects.equals(this.delay, syntheticsMobileStepParams.delay)
&& Objects.equals(this.direction, syntheticsMobileStepParams.direction)
&& Objects.equals(this.element, syntheticsMobileStepParams.element)
&& Objects.equals(this.enable, syntheticsMobileStepParams.enable)
&& Objects.equals(this.enabled, syntheticsMobileStepParams.enabled)
&& Objects.equals(this.maxScrolls, syntheticsMobileStepParams.maxScrolls)
&& Objects.equals(this.positions, syntheticsMobileStepParams.positions)
&& Objects.equals(this.subtestPublicId, syntheticsMobileStepParams.subtestPublicId)
Expand All @@ -456,7 +457,7 @@ public int hashCode() {
delay,
direction,
element,
enable,
enabled,
maxScrolls,
positions,
subtestPublicId,
Expand All @@ -476,7 +477,7 @@ public String toString() {
sb.append(" delay: ").append(toIndentedString(delay)).append("\n");
sb.append(" direction: ").append(toIndentedString(direction)).append("\n");
sb.append(" element: ").append(toIndentedString(element)).append("\n");
sb.append(" enable: ").append(toIndentedString(enable)).append("\n");
sb.append(" enabled: ").append(toIndentedString(enabled)).append("\n");
sb.append(" maxScrolls: ").append(toIndentedString(maxScrolls)).append("\n");
sb.append(" positions: ").append(toIndentedString(positions)).append("\n");
sb.append(" subtestPublicId: ").append(toIndentedString(subtestPublicId)).append("\n");
Expand Down
16 changes: 8 additions & 8 deletions ...va/com/datadog/api/client/v1/model/SyntheticsMobileStepParamsElementRelativePosition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
public class SyntheticsMobileStepParamsElementRelativePosition {
@JsonIgnore public boolean unparsed = false;
public static final String JSON_PROPERTY_X = "x";
private Long x;
private Double x;

public static final String JSON_PROPERTY_Y = "y";
private Long y;
private Double y;

public SyntheticsMobileStepParamsElementRelativePosition x(Long x) {
public SyntheticsMobileStepParamsElementRelativePosition x(Double x) {
this.x = x;
return this;
}
Expand All @@ -44,15 +44,15 @@ public SyntheticsMobileStepParamsElementRelativePosition x(Long x) {
@jakarta.annotation.Nullable
@JsonProperty(JSON_PROPERTY_X)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public Long getX() {
public Double getX() {
return x;
}

public void setX(Long x) {
public void setX(Double x) {
this.x = x;
}

public SyntheticsMobileStepParamsElementRelativePosition y(Long y) {
public SyntheticsMobileStepParamsElementRelativePosition y(Double y) {
this.y = y;
return this;
}
Expand All @@ -65,11 +65,11 @@ public SyntheticsMobileStepParamsElementRelativePosition y(Long y) {
@jakarta.annotation.Nullable
@JsonProperty(JSON_PROPERTY_Y)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public Long getY() {
public Double getY() {
return y;
}

public void setY(Long y) {
public void setY(Double y) {
this.y = y;
}

Expand Down
16 changes: 8 additions & 8 deletions src/main/java/com/datadog/api/client/v1/model/SyntheticsMobileStepParamsPositionsItems.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
public class SyntheticsMobileStepParamsPositionsItems {
@JsonIgnore public boolean unparsed = false;
public static final String JSON_PROPERTY_X = "x";
private Long x;
private Double x;

public static final String JSON_PROPERTY_Y = "y";
private Long y;
private Double y;

public SyntheticsMobileStepParamsPositionsItems x(Long x) {
public SyntheticsMobileStepParamsPositionsItems x(Double x) {
this.x = x;
return this;
}
Expand All @@ -44,15 +44,15 @@ public SyntheticsMobileStepParamsPositionsItems x(Long x) {
@jakarta.annotation.Nullable
@JsonProperty(JSON_PROPERTY_X)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public Long getX() {
public Double getX() {
return x;
}

public void setX(Long x) {
public void setX(Double x) {
this.x = x;
}

public SyntheticsMobileStepParamsPositionsItems y(Long y) {
public SyntheticsMobileStepParamsPositionsItems y(Double y) {
this.y = y;
return this;
}
Expand All @@ -65,11 +65,11 @@ public SyntheticsMobileStepParamsPositionsItems y(Long y) {
@jakarta.annotation.Nullable
@JsonProperty(JSON_PROPERTY_Y)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public Long getY() {
public Double getY() {
return y;
}

public void setY(Long y) {
public void setY(Double y) {
this.y = y;
}

Expand Down
Loading
Loading