aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@yahooinc.com>2023-05-12 20:01:43 +0200
committerValerij Fredriksen <valerijf@yahooinc.com>2023-05-12 20:01:43 +0200
commitf9284ca2a350bf66e3f36ad5a204ff4a619abd7a (patch)
tree98d2c5da20864373378d554b988b73bf836ccfa7
parent34ba37735c74efd222f57ac61f9cac60053d768a (diff)
Add missing unit option in error message
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java5
-rw-r--r--config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithBcpTest.java2
2 files changed, 3 insertions, 4 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java b/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java
index 40fc5086340..89373d8bca0 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java
@@ -31,8 +31,8 @@ import com.yahoo.config.provision.InstanceName;
import com.yahoo.config.provision.RegionName;
import com.yahoo.config.provision.Tags;
import com.yahoo.config.provision.ZoneEndpoint;
-import com.yahoo.config.provision.ZoneEndpoint.AllowedUrn;
import com.yahoo.config.provision.ZoneEndpoint.AccessType;
+import com.yahoo.config.provision.ZoneEndpoint.AllowedUrn;
import com.yahoo.config.provision.zone.ZoneId;
import com.yahoo.io.IOUtils;
import com.yahoo.text.XML;
@@ -44,7 +44,6 @@ import java.io.Reader;
import java.time.Clock;
import java.time.Duration;
import java.time.Instant;
-import java.time.temporal.TemporalUnit;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -830,7 +829,7 @@ public class DeploymentSpecXmlReader {
return Integer.parseInt(durationSpec.substring(0, durationSpec.length() - 1));
}
catch (NumberFormatException e) {
- throw new IllegalArgumentException("Must be an integer followed by 'm' or 'h'");
+ throw new IllegalArgumentException("Must be an integer followed by 'm', 'h' or 'd'");
}
}
diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithBcpTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithBcpTest.java
index 9fe1d08b904..29eed23b6bb 100644
--- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithBcpTest.java
+++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithBcpTest.java
@@ -214,7 +214,7 @@ public class DeploymentSpecWithBcpTest {
fail();
}
catch (IllegalArgumentException e) {
- assertEquals("Illegal deadline 'fast': Must be an integer followed by 'm' or 'h'", Exceptions.toMessageString(e));
+ assertEquals("Illegal deadline 'fast': Must be an integer followed by 'm', 'h' or 'd'", Exceptions.toMessageString(e));
}
}