diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml index 75755ab7e79..590ba2170c5 100644 --- a/.generator/schemas/v2/openapi.yaml +++ b/.generator/schemas/v2/openapi.yaml @@ -62071,35 +62071,17 @@ components: type: object SecurityMonitoringRuleNewValueOptionsForgetAfter: description: The duration in days after which a learned value is forgotten. - enum: - - 1 - - 2 - - 7 - - 14 - - 21 - - 28 format: int32 + maximum: 30 + minimum: 1 type: integer - x-enum-varnames: - - ONE_DAY - - TWO_DAYS - - ONE_WEEK - - TWO_WEEKS - - THREE_WEEKS - - FOUR_WEEKS SecurityMonitoringRuleNewValueOptionsLearningDuration: default: 0 description: "The duration in days during which values are learned, and after which signals will be generated for values that\nweren't learned. If set to 0, a signal will be generated for all new values after the first value is learned." - enum: - - 0 - - 1 - - 7 format: int32 + maximum: 30 + minimum: 0 type: integer - x-enum-varnames: - - ZERO_DAYS - - ONE_DAY - - SEVEN_DAYS SecurityMonitoringRuleNewValueOptionsLearningMethod: default: duration description: The learning method used to determine when signals should be generated for values that weren't learned. diff --git a/examples/v2/security-monitoring/ValidateSecurityMonitoringRule_2609327779.java b/examples/v2/security-monitoring/ValidateSecurityMonitoringRule_2609327779.java index 4eb17209ded..1c99aa15a37 100644 --- a/examples/v2/security-monitoring/ValidateSecurityMonitoringRule_2609327779.java +++ b/examples/v2/security-monitoring/ValidateSecurityMonitoringRule_2609327779.java @@ -11,8 +11,6 @@ import com.datadog.api.client.v2.model.SecurityMonitoringRuleKeepAlive; import com.datadog.api.client.v2.model.SecurityMonitoringRuleMaxSignalDuration; import com.datadog.api.client.v2.model.SecurityMonitoringRuleNewValueOptions; -import com.datadog.api.client.v2.model.SecurityMonitoringRuleNewValueOptionsForgetAfter; -import com.datadog.api.client.v2.model.SecurityMonitoringRuleNewValueOptionsLearningDuration; import com.datadog.api.client.v2.model.SecurityMonitoringRuleNewValueOptionsLearningMethod; import com.datadog.api.client.v2.model.SecurityMonitoringRuleNewValueOptionsLearningThreshold; import com.datadog.api.client.v2.model.SecurityMonitoringRuleOptions; @@ -51,11 +49,9 @@ public static void main(String[] args) { .detectionMethod(SecurityMonitoringRuleDetectionMethod.NEW_VALUE) .newValueOptions( new SecurityMonitoringRuleNewValueOptions() - .forgetAfter( - SecurityMonitoringRuleNewValueOptionsForgetAfter.ONE_WEEK) + .forgetAfter(7) .instantaneousBaseline(true) - .learningDuration( - SecurityMonitoringRuleNewValueOptionsLearningDuration.ONE_DAY) + .learningDuration(1) .learningThreshold( SecurityMonitoringRuleNewValueOptionsLearningThreshold .ZERO_OCCURRENCES) diff --git a/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringRuleNewValueOptions.java b/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringRuleNewValueOptions.java index 9d4969be3f2..77cd67f9ba1 100644 --- a/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringRuleNewValueOptions.java +++ b/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringRuleNewValueOptions.java @@ -29,14 +29,13 @@ public class SecurityMonitoringRuleNewValueOptions { @JsonIgnore public boolean unparsed = false; public static final String JSON_PROPERTY_FORGET_AFTER = "forgetAfter"; - private SecurityMonitoringRuleNewValueOptionsForgetAfter forgetAfter; + private Integer forgetAfter; public static final String JSON_PROPERTY_INSTANTANEOUS_BASELINE = "instantaneousBaseline"; private Boolean instantaneousBaseline; public static final String JSON_PROPERTY_LEARNING_DURATION = "learningDuration"; - private SecurityMonitoringRuleNewValueOptionsLearningDuration learningDuration = - SecurityMonitoringRuleNewValueOptionsLearningDuration.ZERO_DAYS; + private Integer learningDuration = 0; public static final String JSON_PROPERTY_LEARNING_METHOD = "learningMethod"; private SecurityMonitoringRuleNewValueOptionsLearningMethod learningMethod = @@ -46,29 +45,24 @@ public class SecurityMonitoringRuleNewValueOptions { private SecurityMonitoringRuleNewValueOptionsLearningThreshold learningThreshold = SecurityMonitoringRuleNewValueOptionsLearningThreshold.ZERO_OCCURRENCES; - public SecurityMonitoringRuleNewValueOptions forgetAfter( - SecurityMonitoringRuleNewValueOptionsForgetAfter forgetAfter) { + public SecurityMonitoringRuleNewValueOptions forgetAfter(Integer forgetAfter) { this.forgetAfter = forgetAfter; - this.unparsed |= !forgetAfter.isValid(); return this; } /** - * The duration in days after which a learned value is forgotten. + * The duration in days after which a learned value is forgotten. minimum: 1 maximum: 30 * * @return forgetAfter */ @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_FORGET_AFTER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public SecurityMonitoringRuleNewValueOptionsForgetAfter getForgetAfter() { + public Integer getForgetAfter() { return forgetAfter; } - public void setForgetAfter(SecurityMonitoringRuleNewValueOptionsForgetAfter forgetAfter) { - if (!forgetAfter.isValid()) { - this.unparsed = true; - } + public void setForgetAfter(Integer forgetAfter) { this.forgetAfter = forgetAfter; } @@ -96,32 +90,26 @@ public void setInstantaneousBaseline(Boolean instantaneousBaseline) { this.instantaneousBaseline = instantaneousBaseline; } - public SecurityMonitoringRuleNewValueOptions learningDuration( - SecurityMonitoringRuleNewValueOptionsLearningDuration learningDuration) { + public SecurityMonitoringRuleNewValueOptions learningDuration(Integer learningDuration) { this.learningDuration = learningDuration; - this.unparsed |= !learningDuration.isValid(); return this; } /** * The duration in days during which values are learned, and after which signals will be generated * for values that weren't learned. If set to 0, a signal will be generated for all new values - * after the first value is learned. + * after the first value is learned. minimum: 0 maximum: 30 * * @return learningDuration */ @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_LEARNING_DURATION) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public SecurityMonitoringRuleNewValueOptionsLearningDuration getLearningDuration() { + public Integer getLearningDuration() { return learningDuration; } - public void setLearningDuration( - SecurityMonitoringRuleNewValueOptionsLearningDuration learningDuration) { - if (!learningDuration.isValid()) { - this.unparsed = true; - } + public void setLearningDuration(Integer learningDuration) { this.learningDuration = learningDuration; } diff --git a/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringRuleNewValueOptionsForgetAfter.java b/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringRuleNewValueOptionsForgetAfter.java deleted file mode 100644 index 36f9341e627..00000000000 --- a/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringRuleNewValueOptionsForgetAfter.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License. - * This product includes software developed at Datadog (https://www.datadoghq.com/). - * Copyright 2019-Present Datadog, Inc. - */ - -package com.datadog.api.client.v2.model; - -import com.datadog.api.client.ModelEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.StdSerializer; -import java.io.IOException; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; - -/** The duration in days after which a learned value is forgotten. */ -@JsonSerialize( - using = - SecurityMonitoringRuleNewValueOptionsForgetAfter - .SecurityMonitoringRuleNewValueOptionsForgetAfterSerializer.class) -public class SecurityMonitoringRuleNewValueOptionsForgetAfter extends ModelEnum { - - private static final Set allowedValues = - new HashSet(Arrays.asList(1, 2, 7, 14, 21, 28)); - - public static final SecurityMonitoringRuleNewValueOptionsForgetAfter ONE_DAY = - new SecurityMonitoringRuleNewValueOptionsForgetAfter(1); - public static final SecurityMonitoringRuleNewValueOptionsForgetAfter TWO_DAYS = - new SecurityMonitoringRuleNewValueOptionsForgetAfter(2); - public static final SecurityMonitoringRuleNewValueOptionsForgetAfter ONE_WEEK = - new SecurityMonitoringRuleNewValueOptionsForgetAfter(7); - public static final SecurityMonitoringRuleNewValueOptionsForgetAfter TWO_WEEKS = - new SecurityMonitoringRuleNewValueOptionsForgetAfter(14); - public static final SecurityMonitoringRuleNewValueOptionsForgetAfter THREE_WEEKS = - new SecurityMonitoringRuleNewValueOptionsForgetAfter(21); - public static final SecurityMonitoringRuleNewValueOptionsForgetAfter FOUR_WEEKS = - new SecurityMonitoringRuleNewValueOptionsForgetAfter(28); - - SecurityMonitoringRuleNewValueOptionsForgetAfter(Integer value) { - super(value, allowedValues); - } - - public static class SecurityMonitoringRuleNewValueOptionsForgetAfterSerializer - extends StdSerializer { - public SecurityMonitoringRuleNewValueOptionsForgetAfterSerializer( - Class t) { - super(t); - } - - public SecurityMonitoringRuleNewValueOptionsForgetAfterSerializer() { - this(null); - } - - @Override - public void serialize( - SecurityMonitoringRuleNewValueOptionsForgetAfter value, - JsonGenerator jgen, - SerializerProvider provider) - throws IOException, JsonProcessingException { - jgen.writeObject(value.value); - } - } - - @JsonCreator - public static SecurityMonitoringRuleNewValueOptionsForgetAfter fromValue(Integer value) { - return new SecurityMonitoringRuleNewValueOptionsForgetAfter(value); - } -} diff --git a/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringRuleNewValueOptionsLearningDuration.java b/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringRuleNewValueOptionsLearningDuration.java deleted file mode 100644 index 496dd6b02a8..00000000000 --- a/src/main/java/com/datadog/api/client/v2/model/SecurityMonitoringRuleNewValueOptionsLearningDuration.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License. - * This product includes software developed at Datadog (https://www.datadoghq.com/). - * Copyright 2019-Present Datadog, Inc. - */ - -package com.datadog.api.client.v2.model; - -import com.datadog.api.client.ModelEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.StdSerializer; -import java.io.IOException; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; - -/** - * The duration in days during which values are learned, and after which signals will be generated - * for values that weren't learned. If set to 0, a signal will be generated for all new values after - * the first value is learned. - */ -@JsonSerialize( - using = - SecurityMonitoringRuleNewValueOptionsLearningDuration - .SecurityMonitoringRuleNewValueOptionsLearningDurationSerializer.class) -public class SecurityMonitoringRuleNewValueOptionsLearningDuration extends ModelEnum { - - private static final Set allowedValues = new HashSet(Arrays.asList(0, 1, 7)); - - public static final SecurityMonitoringRuleNewValueOptionsLearningDuration ZERO_DAYS = - new SecurityMonitoringRuleNewValueOptionsLearningDuration(0); - public static final SecurityMonitoringRuleNewValueOptionsLearningDuration ONE_DAY = - new SecurityMonitoringRuleNewValueOptionsLearningDuration(1); - public static final SecurityMonitoringRuleNewValueOptionsLearningDuration SEVEN_DAYS = - new SecurityMonitoringRuleNewValueOptionsLearningDuration(7); - - SecurityMonitoringRuleNewValueOptionsLearningDuration(Integer value) { - super(value, allowedValues); - } - - public static class SecurityMonitoringRuleNewValueOptionsLearningDurationSerializer - extends StdSerializer { - public SecurityMonitoringRuleNewValueOptionsLearningDurationSerializer( - Class t) { - super(t); - } - - public SecurityMonitoringRuleNewValueOptionsLearningDurationSerializer() { - this(null); - } - - @Override - public void serialize( - SecurityMonitoringRuleNewValueOptionsLearningDuration value, - JsonGenerator jgen, - SerializerProvider provider) - throws IOException, JsonProcessingException { - jgen.writeObject(value.value); - } - } - - @JsonCreator - public static SecurityMonitoringRuleNewValueOptionsLearningDuration fromValue(Integer value) { - return new SecurityMonitoringRuleNewValueOptionsLearningDuration(value); - } -}