Skip to content

Enable additionalProperties by default #1858

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 6 commits into from
Jun 26, 2023
Merged

Enable additionalProperties by default #1858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4f3de51
set additionalProperties to true by default
skarimo Jun 22, 2023
f7e4167
update test cassette
skarimo Jun 22, 2023
129a624
pre-commit fixes
Jun 22, 2023
1a8e488
user assertThat to ignore additionalProperties
skarimo Jun 22, 2023
99b0ce3
Merge branch 'master' into sherz/additionalProperties
skarimo Jun 22, 2023
27b4058
pre-commit fixes
Jun 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
21 changes: 11 additions & 10 deletions .generator/src/generator/templates/modelSimple.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,14 +259,15 @@ public class {{ name }} {%- if model.get("x-generate-alias-as-model") %} extends
}
{%- endif %}
{%- endfor %}
{%- if model.get("additionalProperties") %}
{%- if model.get("additionalProperties", True) %}
{%- set additionalPropertiesDataType = model.get("additionalProperties", {})|simple_type or "Object" %}

/**
* A container for additional, undeclared properties.
* This is a holder for any undeclared properties as specified with
* the 'additionalProperties' keyword in the OAS document.
*/
private Map<String, {{ model.additionalProperties|simple_type }}> additionalProperties;
private Map<String, {{ additionalPropertiesDataType }}> additionalProperties;

/**
* Set the additional (undeclared) property with the specified name and value.
Expand All @@ -277,9 +278,9 @@ public class {{ name }} {%- if model.get("x-generate-alias-as-model") %} extends
* @return {{ name }}
*/
@JsonAnySetter
public {{ name }} putAdditionalProperty(String key, {{ model.additionalProperties|simple_type }} value) {
public {{ name }} putAdditionalProperty(String key, {{ additionalPropertiesDataType }} value) {
if (this.additionalProperties == null) {
this.additionalProperties = new HashMap<String, {{ model.additionalProperties|simple_type }}>();
this.additionalProperties = new HashMap<String, {{ additionalPropertiesDataType }}>();
}
this.additionalProperties.put(key, value);
return this;
Expand All @@ -291,7 +292,7 @@ public class {{ name }} {%- if model.get("x-generate-alias-as-model") %} extends
* @return The additional properties
*/
@JsonAnyGetter
public Map<String, {{ model.additionalProperties|simple_type }}> getAdditionalProperties() {
public Map<String, {{ additionalPropertiesDataType }}> getAdditionalProperties() {
return additionalProperties;
}

Expand All @@ -301,7 +302,7 @@ public class {{ name }} {%- if model.get("x-generate-alias-as-model") %} extends
* @param key The arbitrary key to get
* @return The specific additional property for the given key
*/
public {{ model.additionalProperties|simple_type }} getAdditionalProperty(String key) {
public {{ additionalPropertiesDataType }} getAdditionalProperty(String key) {
if (this.additionalProperties == null) {
return null;
}
Expand All @@ -322,7 +323,7 @@ public class {{ name }} {%- if model.get("x-generate-alias-as-model") %} extends
}
{%- if model.properties is defined %}
{{ name }} {{ name|variable_name }} = ({{ name }}) o;
return {%- for attr, schema in model.get("properties").items() %} Objects.equals(this.{{ attr|variable_name }}, {{ name|variable_name }}.{{ attr|variable_name }}){%- if loop.nextitem or model.get("additionalProperties") %} &&{%- endif %}{%- endfor %}{% if model.get("additionalProperties") %} Objects.equals(this.additionalProperties, {{ name|variable_name }}.additionalProperties){% endif %}
return {%- for attr, schema in model.get("properties").items() %} Objects.equals(this.{{ attr|variable_name }}, {{ name|variable_name }}.{{ attr|variable_name }}){%- if loop.nextitem or model.get("additionalProperties", True) %} &&{%- endif %}{%- endfor %}{% if model.get("additionalProperties", True) %} Objects.equals(this.additionalProperties, {{ name|variable_name }}.additionalProperties){% endif %}
{%- if model.get("x-generate-alias-as-model") %} &&
super.equals(o){%- endif %};
{%- else %}
Expand All @@ -334,8 +335,8 @@ public class {{ name }} {%- if model.get("x-generate-alias-as-model") %} extends
@Override
public int hashCode() {
return Objects.hash({%- for attr, schema in model.get("properties", {}).items() %}{{ attr|variable_name }}{%- if loop.nextitem %}, {%- endif %}{%-endfor %}
{%- if model.get("additionalProperties") %}, additionalProperties{%- endif %}
{%- if model.get("x-generate-alias-as-model") %}{%- if model.properties is defined %}, {%- endif %}super.hashCode(){%- endif %});
{%- if model.get("additionalProperties", True) %}{%- if model.properties is defined %}, {%- endif %} additionalProperties{%- endif %}
{%- if model.get("x-generate-alias-as-model") %}{%- if model.properties is defined or model.get("additionalProperties", True) %}, {%- endif %}super.hashCode(){%- endif %});
}

@Override
Expand All @@ -348,7 +349,7 @@ public class {{ name }} {%- if model.get("x-generate-alias-as-model") %} extends
{%- for attr, schema in model.get("properties", {}).items() %}
sb.append(" {{ attr|variable_name }}: ").append(toIndentedString({{ attr|variable_name }})).append("\n");
{%- endfor %}
{%- if model.get("additionalProperties") %}
{%- if model.get("additionalProperties", True) %}
sb.append(" additionalProperties: ")
.append(toIndentedString(additionalProperties))
.append("\n");
Expand Down
58 changes: 56 additions & 2 deletions src/main/java/com/datadog/api/client/v1/model/APIErrorResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,17 @@

package com.datadog.api.client.v1.model;

import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;

/** Error response object. */
Expand Down Expand Up @@ -57,6 +61,52 @@ public void setErrors(List<String> errors) {
this.errors = errors;
}

/**
* A container for additional, undeclared properties. This is a holder for any undeclared
* properties as specified with the 'additionalProperties' keyword in the OAS document.
*/
private Map<String, Object> additionalProperties;

/**
* Set the additional (undeclared) property with the specified name and value. If the property
* does not already exist, create it otherwise replace it.
*
* @param key The arbitrary key to set
* @param value The associated value
* @return APIErrorResponse
*/
@JsonAnySetter
public APIErrorResponse putAdditionalProperty(String key, Object value) {
if (this.additionalProperties == null) {
this.additionalProperties = new HashMap<String, Object>();
}
this.additionalProperties.put(key, value);
return this;
}

/**
* Return the additional (undeclared) property.
*
* @return The additional properties
*/
@JsonAnyGetter
public Map<String, Object> getAdditionalProperties() {
return additionalProperties;
}

/**
* Return the additional (undeclared) property with the specified name.
*
* @param key The arbitrary key to get
* @return The specific additional property for the given key
*/
public Object getAdditionalProperty(String key) {
if (this.additionalProperties == null) {
return null;
}
return this.additionalProperties.get(key);
}

/** Return true if this APIErrorResponse object is equal to o. */
@Override
public boolean equals(Object o) {
Expand All @@ -67,19 +117,23 @@ public boolean equals(Object o) {
return false;
}
APIErrorResponse apiErrorResponse = (APIErrorResponse) o;
return Objects.equals(this.errors, apiErrorResponse.errors);
return Objects.equals(this.errors, apiErrorResponse.errors)
&& Objects.equals(this.additionalProperties, apiErrorResponse.additionalProperties);
}

@Override
public int hashCode() {
return Objects.hash(errors);
return Objects.hash(errors, additionalProperties);
}

@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class APIErrorResponse {\n");
sb.append(" errors: ").append(toIndentedString(errors)).append("\n");
sb.append(" additionalProperties: ")
.append(toIndentedString(additionalProperties))
.append("\n");
sb.append("}");
return sb.toString();
}
Expand Down
57 changes: 55 additions & 2 deletions src/main/java/com/datadog/api/client/v1/model/AWSAccount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

package com.datadog.api.client.v1.model;

import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
Expand Down Expand Up @@ -345,6 +347,52 @@ public void setSecretAccessKey(String secretAccessKey) {
this.secretAccessKey = secretAccessKey;
}

/**
* A container for additional, undeclared properties. This is a holder for any undeclared
* properties as specified with the 'additionalProperties' keyword in the OAS document.
*/
private Map<String, Object> additionalProperties;

/**
* Set the additional (undeclared) property with the specified name and value. If the property
* does not already exist, create it otherwise replace it.
*
* @param key The arbitrary key to set
* @param value The associated value
* @return AWSAccount
*/
@JsonAnySetter
public AWSAccount putAdditionalProperty(String key, Object value) {
if (this.additionalProperties == null) {
this.additionalProperties = new HashMap<String, Object>();
}
this.additionalProperties.put(key, value);
return this;
}

/**
* Return the additional (undeclared) property.
*
* @return The additional properties
*/
@JsonAnyGetter
public Map<String, Object> getAdditionalProperties() {
return additionalProperties;
}

/**
* Return the additional (undeclared) property with the specified name.
*
* @param key The arbitrary key to get
* @return The specific additional property for the given key
*/
public Object getAdditionalProperty(String key) {
if (this.additionalProperties == null) {
return null;
}
return this.additionalProperties.get(key);
}

/** Return true if this AWSAccount object is equal to o. */
@Override
public boolean equals(Object o) {
Expand All @@ -367,7 +415,8 @@ public boolean equals(Object o) {
&& Objects.equals(this.metricsCollectionEnabled, awsAccount.metricsCollectionEnabled)
&& Objects.equals(this.resourceCollectionEnabled, awsAccount.resourceCollectionEnabled)
&& Objects.equals(this.roleName, awsAccount.roleName)
&& Objects.equals(this.secretAccessKey, awsAccount.secretAccessKey);
&& Objects.equals(this.secretAccessKey, awsAccount.secretAccessKey)
&& Objects.equals(this.additionalProperties, awsAccount.additionalProperties);
}

@Override
Expand All @@ -383,7 +432,8 @@ public int hashCode() {
metricsCollectionEnabled,
resourceCollectionEnabled,
roleName,
secretAccessKey);
secretAccessKey,
additionalProperties);
}

@Override
Expand All @@ -409,6 +459,9 @@ public String toString() {
.append("\n");
sb.append(" roleName: ").append(toIndentedString(roleName)).append("\n");
sb.append(" secretAccessKey: ").append(toIndentedString(secretAccessKey)).append("\n");
sb.append(" additionalProperties: ")
.append(toIndentedString(additionalProperties))
.append("\n");
sb.append("}");
return sb.toString();
}
Expand Down
59 changes: 57 additions & 2 deletions src/main/java/com/datadog/api/client/v1/model/AWSAccountAndLambdaRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,15 @@

package com.datadog.api.client.v1.model;

import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;

/** AWS account ID and Lambda ARN. */
Expand Down Expand Up @@ -78,6 +82,52 @@ public void setLambdaArn(String lambdaArn) {
this.lambdaArn = lambdaArn;
}

/**
* A container for additional, undeclared properties. This is a holder for any undeclared
* properties as specified with the 'additionalProperties' keyword in the OAS document.
*/
private Map<String, Object> additionalProperties;

/**
* Set the additional (undeclared) property with the specified name and value. If the property
* does not already exist, create it otherwise replace it.
*
* @param key The arbitrary key to set
* @param value The associated value
* @return AWSAccountAndLambdaRequest
*/
@JsonAnySetter
public AWSAccountAndLambdaRequest putAdditionalProperty(String key, Object value) {
if (this.additionalProperties == null) {
this.additionalProperties = new HashMap<String, Object>();
}
this.additionalProperties.put(key, value);
return this;
}

/**
* Return the additional (undeclared) property.
*
* @return The additional properties
*/
@JsonAnyGetter
public Map<String, Object> getAdditionalProperties() {
return additionalProperties;
}

/**
* Return the additional (undeclared) property with the specified name.
*
* @param key The arbitrary key to get
* @return The specific additional property for the given key
*/
public Object getAdditionalProperty(String key) {
if (this.additionalProperties == null) {
return null;
}
return this.additionalProperties.get(key);
}

/** Return true if this AWSAccountAndLambdaRequest object is equal to o. */
@Override
public boolean equals(Object o) {
Expand All @@ -89,12 +139,14 @@ public boolean equals(Object o) {
}
AWSAccountAndLambdaRequest awsAccountAndLambdaRequest = (AWSAccountAndLambdaRequest) o;
return Objects.equals(this.accountId, awsAccountAndLambdaRequest.accountId)
&& Objects.equals(this.lambdaArn, awsAccountAndLambdaRequest.lambdaArn);
&& Objects.equals(this.lambdaArn, awsAccountAndLambdaRequest.lambdaArn)
&& Objects.equals(
this.additionalProperties, awsAccountAndLambdaRequest.additionalProperties);
}

@Override
public int hashCode() {
return Objects.hash(accountId, lambdaArn);
return Objects.hash(accountId, lambdaArn, additionalProperties);
}

@Override
Expand All @@ -103,6 +155,9 @@ public String toString() {
sb.append("class AWSAccountAndLambdaRequest {\n");
sb.append(" accountId: ").append(toIndentedString(accountId)).append("\n");
sb.append(" lambdaArn: ").append(toIndentedString(lambdaArn)).append("\n");
sb.append(" additionalProperties: ")
.append(toIndentedString(additionalProperties))
.append("\n");
sb.append("}");
return sb.toString();
}
Expand Down
Loading