From 190fc231a9ae503aa506e7323a9e9e86580a57e0 Mon Sep 17 00:00:00 2001 From: HÃ¥kon Hallingstad Date: Fri, 2 Apr 2021 15:09:24 +0200 Subject: Avoid serialization of utility methods --- .../main/java/com/yahoo/vespa/applicationmodel/ServiceCluster.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceCluster.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceCluster.java index 417b5792586..baede298896 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceCluster.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceCluster.java @@ -52,10 +52,12 @@ public class ServiceCluster { return applicationInstance.get(); } + @JsonIgnore public boolean isConfigServerLike() { return isConfigServer() || isController(); } + @JsonIgnore public boolean isController() { return isHostedVespaApplicationWithId(ApplicationInstanceId.CONTROLLER) && Objects.equals(clusterId, ClusterId.CONTROLLER) && @@ -63,28 +65,33 @@ public class ServiceCluster { } /** Is a config server (and not controller!) */ + @JsonIgnore public boolean isConfigServer() { return isHostedVespaApplicationWithId(ApplicationInstanceId.CONFIG_SERVER) && Objects.equals(clusterId, ClusterId.CONFIG_SERVER) && Objects.equals(serviceType, ServiceType.CONFIG_SERVER); } + @JsonIgnore public boolean isConfigServerHost() { return isHostedVespaApplicationWithPredicate(ApplicationInstanceId::isConfigServerHost) && Objects.equals(clusterId, ClusterId.CONFIG_SERVER_HOST) && Objects.equals(serviceType, ServiceType.HOST_ADMIN); } + @JsonIgnore public boolean isControllerHost() { return isHostedVespaApplicationWithId(ApplicationInstanceId.CONTROLLER_HOST) && Objects.equals(clusterId, ClusterId.CONTROLLER_HOST) && Objects.equals(serviceType, ServiceType.HOST_ADMIN); } + @JsonIgnore public boolean isConfigServerHostLike() { return isConfigServerHost() || isControllerHost(); } + @JsonIgnore public boolean isTenantHost() { return isHostedVespaApplicationWithPredicate(ApplicationInstanceId::isTenantHost) && Objects.equals(clusterId, ClusterId.TENANT_HOST) && -- cgit v1.2.3