remove only use of autovalue

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);
+    }
 }