diff options
author | Andreas Eriksen <andreer@yahoo-inc.com> | 2017-09-06 14:35:23 +0200 |
---|---|---|
committer | Andreas Eriksen <andreer@yahoo-inc.com> | 2017-09-06 15:28:25 +0200 |
commit | b8103b5af8d0216ce6dd5161039f787c7b3e5d4c (patch) | |
tree | ec9b9b8768e9ac78e38d67fa2634b2b8a40db814 | |
parent | d4c79c2e7c675c7e9b4c974418f58da58cfa2a47 (diff) |
remove only use of autovalue
-rw-r--r-- | orchestrator/pom.xml | 6 | ||||
-rw-r--r-- | orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/InstanceStatusResponse.java | 51 |
2 files changed, 41 insertions, 16 deletions
diff --git a/orchestrator/pom.xml b/orchestrator/pom.xml index b5ac5233efe..55bf086dfc7 100644 --- a/orchestrator/pom.xml +++ b/orchestrator/pom.xml @@ -34,12 +34,6 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>com.google.auto.value</groupId> - <artifactId>auto-value</artifactId> - <version>1.0-rc1</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>jaxrs_client_utils</artifactId> <version>${project.version}</version> diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/InstanceStatusResponse.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/InstanceStatusResponse.java index 4ccb971e339..ce675de434d 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/InstanceStatusResponse.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/InstanceStatusResponse.java @@ -2,30 +2,61 @@ package com.yahoo.vespa.orchestrator.resources; import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.auto.value.AutoValue; - import com.yahoo.vespa.applicationmodel.ApplicationInstance; import com.yahoo.vespa.applicationmodel.HostName; import com.yahoo.vespa.service.monitor.ServiceMonitorStatus; import java.util.Map; +import java.util.Objects; /* * @author andreer */ -@AutoValue -public abstract class InstanceStatusResponse { +public class InstanceStatusResponse { + + private final ApplicationInstance<ServiceMonitorStatus> applicationInstance; + private final Map<HostName, String> hostStates; + + private InstanceStatusResponse(ApplicationInstance<ServiceMonitorStatus> applicationInstance, Map<HostName, String> hostStates) { + this.applicationInstance = applicationInstance; + this.hostStates = hostStates; + } + + public static InstanceStatusResponse create( + ApplicationInstance<ServiceMonitorStatus> applicationInstance, + Map<HostName, String> hostStates) { + return new InstanceStatusResponse(applicationInstance, hostStates); + } @JsonProperty("applicationInstance") - public abstract ApplicationInstance<ServiceMonitorStatus> applicationInstance(); + public ApplicationInstance<ServiceMonitorStatus> applicationInstance() { + return applicationInstance; + } @JsonProperty("hostStates") - public abstract Map<HostName, String> hostStates(); + public Map<HostName, String> hostStates() { + return hostStates; + } - public static InstanceStatusResponse create( - ApplicationInstance<ServiceMonitorStatus> applicationInstance, - Map<HostName, String> hostStates) { - return new AutoValue_InstanceStatusResponse(applicationInstance, hostStates); + @Override + public String toString() { + return "InstanceStatusResponse{" + + "applicationInstance=" + applicationInstance + + ", hostStates=" + hostStates + + '}'; } + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + InstanceStatusResponse that = (InstanceStatusResponse) o; + return Objects.equals(applicationInstance, that.applicationInstance) && + Objects.equals(hostStates, that.hostStates); + } + + @Override + public int hashCode() { + return Objects.hash(applicationInstance, hostStates); + } } |