Don't use optional in with* methods

Also added a serialisation/deserialiasation test for quota

2 files changed, 14 insertions, 4 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);
+    }
 }