diff options
| author | jonmv <venstad@gmail.com> | 2023-04-25 09:13:07 +0200 |
|---|---|---|
| committer | jonmv <venstad@gmail.com> | 2023-04-25 09:13:07 +0200 |
| commit | 6889c83a5c4abef097c7847d5d6f2dcc1c68cf13 (patch) | |
| tree | a1879e23e10e5230413e671e96afb904b75e3fad | |
| parent | 1ae63810114bafb1e81938da7e7f47ec1429cd14 (diff) | |
Iterate through all models, in ConfigModelRepo
| -rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java | 2 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/application/validation/ContainerInCloudValidatorTest.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java b/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java index 4fb61ed8b5e..4306744eb20 100644 --- a/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java +++ b/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java @@ -213,7 +213,7 @@ public class ConfigModelRepo implements ConfigModelRepoAdder, Serializable, Iter public <T extends ConfigModel> List<T> getModels(Class<T> modelClass) { List<T> modelsOfModelClass = new ArrayList<>(); - for (ConfigModel model : asMap().values()) { + for (ConfigModel model : configModels) { if (modelClass.isInstance(model)) modelsOfModelClass.add((T)model); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ContainerInCloudValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ContainerInCloudValidatorTest.java index 3feb8888821..1c22423147c 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ContainerInCloudValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ContainerInCloudValidatorTest.java @@ -21,7 +21,7 @@ public class ContainerInCloudValidatorTest { void failsWhenNoContainerInCloud() throws IOException, SAXException { String noContainer = ""; String container = """ - <container id='default' version='1.0'> + <container id='routing' version='1.0'> <nodes count='2' /> </container> """; @@ -38,7 +38,7 @@ public class ContainerInCloudValidatorTest { String servicesXml = """ <services version='1.0'> %s - <content version='1.0'> + <content id='foo' version='1.0'> <redundancy>2</redundancy> <documents> </documents> |