diff options
3 files changed, 15 insertions, 6 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/Quota.java b/config-model-api/src/main/java/com/yahoo/config/model/api/Quota.java index 01ed33e023e..00d194a37a2 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/Quota.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/Quota.java @@ -40,12 +40,12 @@ public class Quota { return new Quota(clusterSize.map(Long::intValue), budget, true); } - public Quota withBudget(Optional<BigDecimal> budget) { - return new Quota(this.maxClusterSize, budget, true); + public Quota withBudget(BigDecimal budget) { + return new Quota(this.maxClusterSize, Optional.of(budget), true); } - public Quota withClusterSize(Optional<Integer> clusterSize) { - return new Quota(clusterSize, this.budget, true); + public Quota withClusterSize(int clusterSize) { + return new Quota(Optional.of(clusterSize), this.budget, true); } public Slime toSlime() { diff --git a/config-model-api/src/test/java/com/yahoo/config/model/api/QuotaTest.java b/config-model-api/src/test/java/com/yahoo/config/model/api/QuotaTest.java index 83d4ffbbe72..b4a7ff7c762 100644 --- a/config-model-api/src/test/java/com/yahoo/config/model/api/QuotaTest.java +++ b/config-model-api/src/test/java/com/yahoo/config/model/api/QuotaTest.java @@ -9,6 +9,9 @@ import java.math.BigDecimal; import static org.junit.Assert.assertEquals; +/** + * @author ogronnesby + */ public class QuotaTest { @Test @@ -38,4 +41,11 @@ public class QuotaTest { assertEquals(new BigDecimal("123.4"), quota.budgetAsDecimal().get()); } + @Test + public void test_serde() { + var quota = Quota.unlimited().withBudget(BigDecimal.valueOf(23.5)).withClusterSize(11); + var serialized = quota.toSlime(); + var deserialized = Quota.fromSlime(serialized.get()); + assertEquals(quota, deserialized); + } } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/QuotaValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/QuotaValidatorTest.java index 699fd2c9fe2..9eb3f9b8541 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/QuotaValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/QuotaValidatorTest.java @@ -7,7 +7,6 @@ import com.yahoo.config.provision.Environment; import org.junit.Test; import java.math.BigDecimal; -import java.util.Optional; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -17,7 +16,7 @@ import static org.junit.Assert.fail; */ public class QuotaValidatorTest { - private final Quota quota = Quota.unlimited().withClusterSize(Optional.of(10)).withBudget(Optional.of(BigDecimal.valueOf(1))); + private final Quota quota = Quota.unlimited().withClusterSize(10).withBudget(BigDecimal.valueOf(1)); @Test public void test_deploy_under_quota() { |