diff options
Diffstat (limited to 'application-model/src')
4 files changed, 26 insertions, 15 deletions
diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstance.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstance.java index d2796f600c6..3363ddb040f 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstance.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstance.java @@ -9,13 +9,13 @@ import java.util.Set; /** * @author bjorncs */ -public class ApplicationInstance<STATUS> { +public class ApplicationInstance { private final TenantId tenantId; private final ApplicationInstanceId applicationInstanceId; - private final Set<ServiceCluster<STATUS>> serviceClusters; + private final Set<ServiceCluster> serviceClusters; - public ApplicationInstance(TenantId tenantId, ApplicationInstanceId applicationInstanceId, Set<ServiceCluster<STATUS>> serviceClusters) { + public ApplicationInstance(TenantId tenantId, ApplicationInstanceId applicationInstanceId, Set<ServiceCluster> serviceClusters) { this.tenantId = tenantId; this.applicationInstanceId = applicationInstanceId; this.serviceClusters = serviceClusters; @@ -32,7 +32,7 @@ public class ApplicationInstance<STATUS> { } @JsonProperty("serviceClusters") - public Set<ServiceCluster<STATUS>> serviceClusters() { + public Set<ServiceCluster> serviceClusters() { return serviceClusters; } @@ -45,7 +45,7 @@ public class ApplicationInstance<STATUS> { public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - ApplicationInstance<?> that = (ApplicationInstance<?>) o; + ApplicationInstance that = (ApplicationInstance) o; return Objects.equals(tenantId, that.tenantId) && Objects.equals(applicationInstanceId, that.applicationInstanceId) && Objects.equals(serviceClusters, that.serviceClusters); 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 84d1b44bbf2..d18ced478f1 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 @@ -11,13 +11,13 @@ import java.util.Set; * * @author bjorncs */ -public class ServiceCluster<STATUS> { +public class ServiceCluster { private final ClusterId clusterId; private final ServiceType serviceType; - private final Set<ServiceInstance<STATUS>> serviceInstances; + private final Set<ServiceInstance> serviceInstances; - public ServiceCluster(ClusterId clusterId, ServiceType serviceType, Set<ServiceInstance<STATUS>> serviceInstances) { + public ServiceCluster(ClusterId clusterId, ServiceType serviceType, Set<ServiceInstance> serviceInstances) { this.clusterId = clusterId; this.serviceType = serviceType; this.serviceInstances = serviceInstances; @@ -34,7 +34,7 @@ public class ServiceCluster<STATUS> { } @JsonProperty("serviceInstances") - public Set<ServiceInstance<STATUS>> serviceInstances() { + public Set<ServiceInstance> serviceInstances() { return serviceInstances; } @@ -51,7 +51,7 @@ public class ServiceCluster<STATUS> { public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - ServiceCluster<?> that = (ServiceCluster<?>) o; + ServiceCluster that = (ServiceCluster) o; return Objects.equals(clusterId, that.clusterId) && Objects.equals(serviceType, that.serviceType) && Objects.equals(serviceInstances, that.serviceInstances); diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceInstance.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceInstance.java index cb3e6f5e077..2b31bb11ff7 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceInstance.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceInstance.java @@ -8,13 +8,13 @@ import java.util.Objects; /** * @author bjorncs */ -public class ServiceInstance<STATUS> { +public class ServiceInstance { private final ConfigId configId; private final HostName hostName; - private final STATUS serviceStatus; + private final ServiceStatus serviceStatus; - public ServiceInstance(ConfigId configId, HostName hostName, STATUS serviceStatus) { + public ServiceInstance(ConfigId configId, HostName hostName, ServiceStatus serviceStatus) { this.configId = configId; this.hostName = hostName; this.serviceStatus = serviceStatus; @@ -31,7 +31,7 @@ public class ServiceInstance<STATUS> { } @JsonProperty("serviceStatus") - public STATUS serviceStatus() { + public ServiceStatus serviceStatus() { return serviceStatus; } @@ -48,7 +48,7 @@ public class ServiceInstance<STATUS> { public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - ServiceInstance<?> that = (ServiceInstance<?>) o; + ServiceInstance that = (ServiceInstance) o; return Objects.equals(configId, that.configId) && Objects.equals(hostName, that.hostName) && Objects.equals(serviceStatus, that.serviceStatus); diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceStatus.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceStatus.java new file mode 100644 index 00000000000..a30ae29e1b6 --- /dev/null +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceStatus.java @@ -0,0 +1,11 @@ +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.vespa.applicationmodel; + +/** + * @author oyving + */ +public enum ServiceStatus { + UP, + DOWN, + NOT_CHECKED; +} |