Skip to content

Fix null date-time serialization #1829

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

Fix null date-time serialization #1829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c07fbc2
fix null date-time serialization
skarimo Jun 6, 2023
00aaa88
pre-commit fixes
Jun 6, 2023
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
7 changes: 7 additions & 0 deletions .generator/src/generator/templates/JSON.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ package {{ common_package_name }};

import com.fasterxml.jackson.annotation.*;
import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import java.text.DateFormat;
import java.time.OffsetDateTime;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
Expand All @@ -29,6 +31,11 @@ public class JSON implements ContextResolver<ObjectMapper> {
mapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
mapper.setDateFormat(new RFC3339DateFormat());
mapper.registerModule(new JavaTimeModule());

SimpleModule module = new SimpleModule();
module.addSerializer(OffsetDateTime.class, new JsonTimeSerializer());
mapper.registerModule(module);

JsonNullableModule jnm = new JsonNullableModule();
mapper.registerModule(jnm);
}
Expand Down
3 changes: 0 additions & 3 deletions .generator/src/generator/templates/modelSimple.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ public class {{ name }} {%- if model.get("x-generate-alias-as-model") %} extends
{%- set defaultValue = schema.get("default", None) %}
public static final String JSON_PROPERTY_{{ attr|snake_case|upper }} = "{{ attr }}";

{%- if schema.format == "date-time" %}
@JsonSerialize(using = JsonTimeSerializer.class)
{%- endif %}
{%- if not isRequired and isNullable %}
{%- if "items" in schema or schema.additionalProperties is defined or (schema.type is not defined and "oneOf" not in schema) %}
private JsonNullable<{{ dataType }}> {{ variableName }} = JsonNullable.<{{ dataType }}>undefined();
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@
<jakarta-annotation-version>2.1.0</jakarta-annotation-version>
<scribejava-version>8.3.1</scribejava-version>
<junit-version>4.13.2</junit-version>
<dd-java-agent-version>0.113.0</dd-java-agent-version>
<dd-java-agent-version>1.15.3</dd-java-agent-version>
<cucumber-version>7.2.3</cucumber-version>
<project.scm.id>github</project.scm.id>
</properties>
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/com/datadog/api/client/JSON.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@

import com.fasterxml.jackson.annotation.*;
import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import jakarta.ws.rs.core.GenericType;
import jakarta.ws.rs.ext.ContextResolver;
import java.text.DateFormat;
import java.time.OffsetDateTime;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
Expand All @@ -34,6 +36,11 @@ public JSON() {
mapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
mapper.setDateFormat(new RFC3339DateFormat());
mapper.registerModule(new JavaTimeModule());

SimpleModule module = new SimpleModule();
module.addSerializer(OffsetDateTime.class, new JsonTimeSerializer());
mapper.registerModule(module);

JsonNullableModule jnm = new JsonNullableModule();
mapper.registerModule(jnm);
}
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/com/datadog/api/client/v1/model/Dashboard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@

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

import com.datadog.api.client.JsonTimeSerializer;
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 com.fasterxml.jackson.databind.annotation.JsonSerialize;
import java.time.OffsetDateTime;
import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -53,8 +51,6 @@ public class Dashboard {
private JsonNullable<String> authorName = JsonNullable.<String>undefined();

public static final String JSON_PROPERTY_CREATED_AT = "created_at";

@JsonSerialize(using = JsonTimeSerializer.class)
private OffsetDateTime createdAt;

public static final String JSON_PROPERTY_DESCRIPTION = "description";
Expand All @@ -70,8 +66,6 @@ public class Dashboard {
private DashboardLayoutType layoutType;

public static final String JSON_PROPERTY_MODIFIED_AT = "modified_at";

@JsonSerialize(using = JsonTimeSerializer.class)
private OffsetDateTime modifiedAt;

public static final String JSON_PROPERTY_NOTIFY_LIST = "notify_list";
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/com/datadog/api/client/v1/model/DashboardList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@

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

import com.datadog.api.client.JsonTimeSerializer;
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 com.fasterxml.jackson.databind.annotation.JsonSerialize;
import java.time.OffsetDateTime;
import java.util.Objects;

Expand All @@ -35,8 +33,6 @@ public class DashboardList {
private Creator author;

public static final String JSON_PROPERTY_CREATED = "created";

@JsonSerialize(using = JsonTimeSerializer.class)
private OffsetDateTime created;

public static final String JSON_PROPERTY_DASHBOARD_COUNT = "dashboard_count";
Expand All @@ -49,8 +45,6 @@ public class DashboardList {
private Boolean isFavorite;

public static final String JSON_PROPERTY_MODIFIED = "modified";

@JsonSerialize(using = JsonTimeSerializer.class)
private OffsetDateTime modified;

public static final String JSON_PROPERTY_NAME = "name";
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/com/datadog/api/client/v1/model/DashboardSummaryDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@

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

import com.datadog.api.client.JsonTimeSerializer;
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 com.fasterxml.jackson.databind.annotation.JsonSerialize;
import java.time.OffsetDateTime;
import java.util.Objects;
import org.openapitools.jackson.nullable.JsonNullable;
Expand All @@ -36,8 +34,6 @@ public class DashboardSummaryDefinition {
private String authorHandle;

public static final String JSON_PROPERTY_CREATED_AT = "created_at";

@JsonSerialize(using = JsonTimeSerializer.class)
private OffsetDateTime createdAt;

public static final String JSON_PROPERTY_DESCRIPTION = "description";
Expand All @@ -53,8 +49,6 @@ public class DashboardSummaryDefinition {
private DashboardLayoutType layoutType;

public static final String JSON_PROPERTY_MODIFIED_AT = "modified_at";

@JsonSerialize(using = JsonTimeSerializer.class)
private OffsetDateTime modifiedAt;

public static final String JSON_PROPERTY_TITLE = "title";
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/com/datadog/api/client/v1/model/HourlyUsageAttributionBody.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@

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

import com.datadog.api.client.JsonTimeSerializer;
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 com.fasterxml.jackson.databind.annotation.JsonSerialize;
import java.time.OffsetDateTime;
import java.util.HashMap;
import java.util.List;
Expand All @@ -36,8 +34,6 @@
public class HourlyUsageAttributionBody {
@JsonIgnore public boolean unparsed = false;
public static final String JSON_PROPERTY_HOUR = "hour";

@JsonSerialize(using = JsonTimeSerializer.class)
private OffsetDateTime hour;

public static final String JSON_PROPERTY_ORG_NAME = "org_name";
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/com/datadog/api/client/v1/model/LogContent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@

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

import com.datadog.api.client.JsonTimeSerializer;
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 com.fasterxml.jackson.databind.annotation.JsonSerialize;
import java.time.OffsetDateTime;
import java.util.ArrayList;
import java.util.HashMap;
Expand Down Expand Up @@ -48,8 +46,6 @@ public class LogContent {
private List<String> tags = null;

public static final String JSON_PROPERTY_TIMESTAMP = "timestamp";

@JsonSerialize(using = JsonTimeSerializer.class)
private OffsetDateTime timestamp;

public LogContent attributes(Map<String, Object> attributes) {
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/com/datadog/api/client/v1/model/LogsByRetentionMonthlyUsage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@

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

import com.datadog.api.client.JsonTimeSerializer;
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 com.fasterxml.jackson.databind.annotation.JsonSerialize;
import java.time.OffsetDateTime;
import java.util.ArrayList;
import java.util.List;
Expand All @@ -27,8 +25,6 @@
public class LogsByRetentionMonthlyUsage {
@JsonIgnore public boolean unparsed = false;
public static final String JSON_PROPERTY_DATE = "date";

@JsonSerialize(using = JsonTimeSerializer.class)
private OffsetDateTime date;

public static final String JSON_PROPERTY_USAGE = "usage";
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/com/datadog/api/client/v1/model/LogsListRequestTime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@

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

import com.datadog.api.client.JsonTimeSerializer;
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 com.fasterxml.jackson.databind.annotation.JsonSerialize;
import java.time.OffsetDateTime;
import java.util.Objects;

Expand All @@ -27,16 +25,12 @@
public class LogsListRequestTime {
@JsonIgnore public boolean unparsed = false;
public static final String JSON_PROPERTY_FROM = "from";

@JsonSerialize(using = JsonTimeSerializer.class)
private OffsetDateTime from;

public static final String JSON_PROPERTY_TIMEZONE = "timezone";
private String timezone;

public static final String JSON_PROPERTY_TO = "to";

@JsonSerialize(using = JsonTimeSerializer.class)
private OffsetDateTime to;

public LogsListRequestTime() {}
Expand Down
8 changes: 0 additions & 8 deletions src/main/java/com/datadog/api/client/v1/model/Monitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@

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

import com.datadog.api.client.JsonTimeSerializer;
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 com.fasterxml.jackson.databind.annotation.JsonSerialize;
import java.time.OffsetDateTime;
import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -44,16 +42,12 @@
public class Monitor {
@JsonIgnore public boolean unparsed = false;
public static final String JSON_PROPERTY_CREATED = "created";

@JsonSerialize(using = JsonTimeSerializer.class)
private OffsetDateTime created;

public static final String JSON_PROPERTY_CREATOR = "creator";
private Creator creator;

public static final String JSON_PROPERTY_DELETED = "deleted";

@JsonSerialize(using = JsonTimeSerializer.class)
private JsonNullable<OffsetDateTime> deleted = JsonNullable.<OffsetDateTime>undefined();

public static final String JSON_PROPERTY_ID = "id";
Expand All @@ -66,8 +60,6 @@ public class Monitor {
private String message;

public static final String JSON_PROPERTY_MODIFIED = "modified";

@JsonSerialize(using = JsonTimeSerializer.class)
private OffsetDateTime modified;

public static final String JSON_PROPERTY_MULTI = "multi";
Expand Down
8 changes: 0 additions & 8 deletions src/main/java/com/datadog/api/client/v1/model/MonitorUpdateRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@

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

import com.datadog.api.client.JsonTimeSerializer;
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 com.fasterxml.jackson.databind.annotation.JsonSerialize;
import java.time.OffsetDateTime;
import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -42,16 +40,12 @@
public class MonitorUpdateRequest {
@JsonIgnore public boolean unparsed = false;
public static final String JSON_PROPERTY_CREATED = "created";

@JsonSerialize(using = JsonTimeSerializer.class)
private OffsetDateTime created;

public static final String JSON_PROPERTY_CREATOR = "creator";
private Creator creator;

public static final String JSON_PROPERTY_DELETED = "deleted";

@JsonSerialize(using = JsonTimeSerializer.class)
private JsonNullable<OffsetDateTime> deleted = JsonNullable.<OffsetDateTime>undefined();

public static final String JSON_PROPERTY_ID = "id";
Expand All @@ -61,8 +55,6 @@ public class MonitorUpdateRequest {
private String message;

public static final String JSON_PROPERTY_MODIFIED = "modified";

@JsonSerialize(using = JsonTimeSerializer.class)
private OffsetDateTime modified;

public static final String JSON_PROPERTY_MULTI = "multi";
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/com/datadog/api/client/v1/model/MonthlyUsageAttributionBody.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@

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

import com.datadog.api.client.JsonTimeSerializer;
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 com.fasterxml.jackson.databind.annotation.JsonSerialize;
import java.time.OffsetDateTime;
import java.util.HashMap;
import java.util.List;
Expand All @@ -35,8 +33,6 @@
public class MonthlyUsageAttributionBody {
@JsonIgnore public boolean unparsed = false;
public static final String JSON_PROPERTY_MONTH = "month";

@JsonSerialize(using = JsonTimeSerializer.class)
private OffsetDateTime month;

public static final String JSON_PROPERTY_ORG_NAME = "org_name";
Expand All @@ -56,8 +52,6 @@ public class MonthlyUsageAttributionBody {
JsonNullable.<Map<String, List<String>>>undefined();

public static final String JSON_PROPERTY_UPDATED_AT = "updated_at";

@JsonSerialize(using = JsonTimeSerializer.class)
private OffsetDateTime updatedAt;

public static final String JSON_PROPERTY_VALUES = "values";
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/com/datadog/api/client/v1/model/NotebookAbsoluteTime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@

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

import com.datadog.api.client.JsonTimeSerializer;
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 com.fasterxml.jackson.databind.annotation.JsonSerialize;
import java.time.OffsetDateTime;
import java.util.Objects;

Expand All @@ -27,16 +25,12 @@
public class NotebookAbsoluteTime {
@JsonIgnore public boolean unparsed = false;
public static final String JSON_PROPERTY_END = "end";

@JsonSerialize(using = JsonTimeSerializer.class)
private OffsetDateTime end;

public static final String JSON_PROPERTY_LIVE = "live";
private Boolean live;

public static final String JSON_PROPERTY_START = "start";

@JsonSerialize(using = JsonTimeSerializer.class)
private OffsetDateTime start;

public NotebookAbsoluteTime() {}
Expand Down
Loading