summaryrefslogtreecommitdiffstats
path: root/config-model-api
diff options
context:
space:
mode:
authorHarald Musum <musum@vespa.ai>2023-12-21 10:15:22 +0100
committerGitHub <noreply@github.com>2023-12-21 10:15:22 +0100
commit4b67fbc8d76a9e4137bd080ea0ee0ee5ebd8e6b1 (patch)
treec41fad645d6da852b5c122fd298a46d7d79141ea /config-model-api
parentd73a4b8daaffd30c78d3894a73e5b2eb79af06af (diff)
Revert "Jonmv/keep config change actions in dev"
Diffstat (limited to 'config-model-api')
-rw-r--r--config-model-api/abi-spec.json4
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/application/api/ValidationOverrides.java9
2 files changed, 2 insertions, 11 deletions
diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json
index 10c5662678e..c3e20e534ff 100644
--- a/config-model-api/abi-spec.json
+++ b/config-model-api/abi-spec.json
@@ -771,9 +771,7 @@
"attributes" : [
"public"
],
- "methods" : [
- "public java.util.Map messagesById()"
- ],
+ "methods" : [ ],
"fields" : [ ]
},
"com.yahoo.config.application.api.ValidationOverrides" : {
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 7b52d825473..1edddb63e52 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
@@ -15,7 +15,6 @@ import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -37,7 +36,7 @@ public class ValidationOverrides {
private final String xmlForm;
- /** Creates a validation overrides which does not have an XML form */
+ /** Creates a validation overrides which does not have an xml form */
public ValidationOverrides(List<Allow> overrides) {
this(overrides, null);
}
@@ -164,13 +163,10 @@ public class ValidationOverrides {
*/
public static class ValidationException extends IllegalArgumentException {
- private final Map<ValidationId, Collection<String>> messagesById = new LinkedHashMap<>();
-
static final long serialVersionUID = 789984668;
private ValidationException(ValidationId validationId, String message) {
super(validationId + ": " + message + ". " + toAllowMessage(validationId));
- messagesById.put(validationId, List.of(message));
}
private ValidationException(Map<ValidationId, Collection<String>> messagesById) {
@@ -179,11 +175,8 @@ public class ValidationOverrides {
String.join("\n\t", messages.getValue()) + "\n" +
toAllowMessage(messages.getKey()))
.collect(Collectors.joining("\n")));
- messagesById.forEach((id, messages) -> this.messagesById.put(id, List.copyOf(messages)));
}
- public Map<ValidationId, Collection<String>> messagesById() { return Map.copyOf(messagesById); }
-
}
}