diff options
Diffstat (limited to 'openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/EntitlementPoolRequestDto.java')
-rw-r--r-- | openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/EntitlementPoolRequestDto.java | 46 |
1 files changed, 1 insertions, 45 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/EntitlementPoolRequestDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/EntitlementPoolRequestDto.java index b49a138a09..79cf750f74 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/EntitlementPoolRequestDto.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/EntitlementPoolRequestDto.java @@ -33,7 +33,7 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; @ApiModel(value = "EntitlementPoolRequest") -//@JsonIgnoreProperties(value = {"manufacturerReferenceNumber"}) +@JsonIgnoreProperties({"manufacturerReferenceNumber", "time", "aggregationFunction", "entitlementMetric"}) public class EntitlementPoolRequestDto { @NotNull @@ -46,23 +46,11 @@ public class EntitlementPoolRequestDto { private Integer thresholdValue; private ThresholdUnit thresholdUnits; - @NotNull - @Valid - private ChoiceOrOtherDto<EntitlementMetric> entitlementMetric; @Size(max = 120) private String increments; - @NotNull - @Valid - private ChoiceOrOtherDto<AggregationFunction> aggregationFunction; @Valid private MultiChoiceOrOtherDto<OperationalScope> operationalScope; - @NotNull - @Valid - private ChoiceOrOtherDto<EntitlementTime> time; - @NotNull - @Size(max = 100) - private String manufacturerReferenceNumber; private String startDate; private String expiryDate; @@ -99,14 +87,6 @@ public class EntitlementPoolRequestDto { this.thresholdUnits = thresholdUnits; } - public ChoiceOrOtherDto<EntitlementMetric> getEntitlementMetric() { - return entitlementMetric; - } - - public void setEntitlementMetric(ChoiceOrOtherDto<EntitlementMetric> entitlementMetric) { - this.entitlementMetric = entitlementMetric; - } - public String getIncrements() { return increments; } @@ -115,14 +95,6 @@ public class EntitlementPoolRequestDto { this.increments = increments; } - public ChoiceOrOtherDto<AggregationFunction> getAggregationFunction() { - return aggregationFunction; - } - - public void setAggregationFunction(ChoiceOrOtherDto<AggregationFunction> aggregationFunction) { - this.aggregationFunction = aggregationFunction; - } - public MultiChoiceOrOtherDto<OperationalScope> getOperationalScope() { return operationalScope; } @@ -131,22 +103,6 @@ public class EntitlementPoolRequestDto { this.operationalScope = operationalScope; } - public ChoiceOrOtherDto<EntitlementTime> getTime() { - return time; - } - - public void setTime(ChoiceOrOtherDto<EntitlementTime> time) { - this.time = time; - } - - public String getManufacturerReferenceNumber() { - return manufacturerReferenceNumber; - } - - public void setManufacturerReferenceNumber(String manufacturerReferenceNumber) { - this.manufacturerReferenceNumber = manufacturerReferenceNumber; - } - public String getStartDate() { return startDate; } |