diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-10-30 17:17:15 +0100 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-10-30 17:25:23 +0100 |
| commit | cc23e7060d7b10ca352cf962b01a3b28c35e90e3 (patch) | |
| tree | 55a0a77d976dbf2e03394fbdfb7ebdb1ae87f4d8 /config-model-api | |
| parent | cd697c00530831e3dd711d789ca3e2c9873cd362 (diff) | |
Make method mockable from Mockito
Diffstat (limited to 'config-model-api')
| -rw-r--r-- | config-model-api/abi-spec.json | 2 | ||||
| -rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/application/api/ValidationOverrides.java | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json index c67e86de38b..9df68821454 100644 --- a/config-model-api/abi-spec.json +++ b/config-model-api/abi-spec.json @@ -592,7 +592,7 @@ "methods": [ "public void <init>(java.util.List)", "public void invalid(com.yahoo.config.application.api.ValidationId, java.lang.String, java.time.Instant)", - "public final boolean allows(java.lang.String, java.time.Instant)", + "public boolean allows(java.lang.String, java.time.Instant)", "public boolean allows(com.yahoo.config.application.api.ValidationId, java.time.Instant)", "public java.lang.String xmlForm()", "public static java.lang.String toAllowMessage(com.yahoo.config.application.api.ValidationId)", diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/ValidationOverrides.java b/config-model-api/src/main/java/com/yahoo/config/application/api/ValidationOverrides.java index bcf2ce3999a..a85e109f731 100644 --- a/config-model-api/src/main/java/com/yahoo/config/application/api/ValidationOverrides.java +++ b/config-model-api/src/main/java/com/yahoo/config/application/api/ValidationOverrides.java @@ -17,7 +17,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.logging.Level; -import java.util.logging.Logger; /** * A set of allows which suppresses specific validations in limited time periods. @@ -54,7 +53,7 @@ public class ValidationOverrides { throw new ValidationException(validationId, message); } - public final boolean allows(String validationIdString, Instant now) { + public boolean allows(String validationIdString, Instant now) { Optional<ValidationId> validationId = ValidationId.from(validationIdString); if ( ! validationId.isPresent()) return false; // unknown id -> not allowed return allows(validationId.get(), now); |