summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2021-04-03 11:35:39 +0200
committerGitHub <noreply@github.com>2021-04-03 11:35:39 +0200
commit55766b25eadd4c9527040fd1a8b3458fc526e713 (patch)
tree71b312ed9b1282e8cbdde4dfd659fadd7c6017a1
parentf1ddec4ce4a9aeb5679c2a8fadba2bfb32d358e5 (diff)
parent190fc231a9ae503aa506e7323a9e9e86580a57e0 (diff)
Merge pull request #17260 from vespa-engine/hakonhall/avoid-serialization-of-utility-methods
Avoid serialization of utility methods
-rw-r--r--application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceCluster.java7
1 files changed, 7 insertions, 0 deletions
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) &&