Avoid recursive hashCode and equals

2 files changed, 4 insertions, 6 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 e53058f40e3..925527d2732 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
@@ -70,12 +70,11 @@ public class ServiceCluster {
         ServiceCluster that = (ServiceCluster) o;
         return Objects.equals(clusterId, that.clusterId) &&
                 Objects.equals(serviceType, that.serviceType) &&
-                Objects.equals(serviceInstances, that.serviceInstances) &&
-                Objects.equals(applicationInstance, that.applicationInstance);
+                Objects.equals(serviceInstances, that.serviceInstances);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(clusterId, serviceType, serviceInstances, applicationInstance);
+        return Objects.hash(clusterId, serviceType, 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 4c802218b22..37d802406d1 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
@@ -65,12 +65,11 @@ public class ServiceInstance {
         ServiceInstance that = (ServiceInstance) o;
         return Objects.equals(configId, that.configId) &&
                 Objects.equals(hostName, that.hostName) &&
-                serviceStatus == that.serviceStatus &&
-                Objects.equals(serviceCluster, that.serviceCluster);
+                serviceStatus == that.serviceStatus;
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(configId, hostName, serviceStatus, serviceCluster);
+        return Objects.hash(configId, hostName, serviceStatus);
     }
 }