From 5eb2f051ab72eb1bc373dbd10bff922a423c05c0 Mon Sep 17 00:00:00 2001 From: Håkon Hallingstad Date: Fri, 17 Nov 2023 16:33:56 +0100 Subject: Add links to core dump tickets --- .../vespa/applicationmodel/InfrastructureApplication.java | 11 +++++++++++ .../src/main/java/com/yahoo/config/provision/NodeType.java | 8 ++++++++ 2 files changed, 19 insertions(+) diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/InfrastructureApplication.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/InfrastructureApplication.java index 560c3d169d3..e3b17762ae5 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/InfrastructureApplication.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/InfrastructureApplication.java @@ -5,6 +5,7 @@ import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.NodeType; import java.util.List; +import java.util.Optional; import java.util.stream.Stream; /** @@ -37,6 +38,16 @@ public enum InfrastructureApplication { .orElseThrow(() -> new IllegalArgumentException("No application associated with " + nodeType)); } + public static Optional of(ApplicationId applicationId) { + for (var application : values()) { + if (application.id.equals(applicationId)) { + return Optional.of(application); + } + } + + return Optional.empty(); + } + InfrastructureApplication(String name, NodeType nodeType) { this.id = ApplicationId.from(TenantId.HOSTED_VESPA.value(), name, "default"); this.nodeType = nodeType; diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeType.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeType.java index 0eac568ec45..ff2cb26f250 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeType.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeType.java @@ -2,6 +2,7 @@ package com.yahoo.config.provision; import java.util.List; +import java.util.Optional; /** * The possible types of nodes in the node repository @@ -37,6 +38,13 @@ public enum NodeType { private final String description; private final List childNodeTypes; + public static Optional ofOptional(String name) { + for (var type : values()) { + if (type.name().equals(name)) return Optional.of(type); + } + return Optional.empty(); + } + NodeType(String description, NodeType... childNodeTypes) { this.childNodeTypes = List.of(childNodeTypes); this.description = description; -- cgit v1.2.3 From 8f7e2c1349d7e7add961b9d657cc7dce405e5265 Mon Sep 17 00:00:00 2001 From: Håkon Hallingstad Date: Fri, 17 Nov 2023 16:56:46 +0100 Subject: Remove unused method --- .../vespa/applicationmodel/InfrastructureApplication.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/InfrastructureApplication.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/InfrastructureApplication.java index e3b17762ae5..1c0a10ee2ea 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/InfrastructureApplication.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/InfrastructureApplication.java @@ -38,16 +38,6 @@ public enum InfrastructureApplication { .orElseThrow(() -> new IllegalArgumentException("No application associated with " + nodeType)); } - public static Optional of(ApplicationId applicationId) { - for (var application : values()) { - if (application.id.equals(applicationId)) { - return Optional.of(application); - } - } - - return Optional.empty(); - } - InfrastructureApplication(String name, NodeType nodeType) { this.id = ApplicationId.from(TenantId.HOSTED_VESPA.value(), name, "default"); this.nodeType = nodeType; -- cgit v1.2.3 From 885d166a929765dd0bdb41537a4b89ddb143fd0f Mon Sep 17 00:00:00 2001 From: Håkon Hallingstad Date: Mon, 20 Nov 2023 13:17:21 +0100 Subject: Add method to get InfrastructureApplication from an ID --- .../vespa/applicationmodel/InfrastructureApplication.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/InfrastructureApplication.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/InfrastructureApplication.java index 1c0a10ee2ea..72a278b248a 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/InfrastructureApplication.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/InfrastructureApplication.java @@ -38,6 +38,16 @@ public enum InfrastructureApplication { .orElseThrow(() -> new IllegalArgumentException("No application associated with " + nodeType)); } + public static Optional ofOptional(ApplicationId applicationId) { + for (var application : values()) { + if (application.id.equals(applicationId)) { + return Optional.of(application); + } + } + + return Optional.empty(); + } + InfrastructureApplication(String name, NodeType nodeType) { this.id = ApplicationId.from(TenantId.HOSTED_VESPA.value(), name, "default"); this.nodeType = nodeType; -- cgit v1.2.3