Merge remote-tracking branch 'origin/2.2.x'

# Conflicts:
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/DefaultRequest.java
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/DefaultRequestContext.java
This commit is contained in:
Olga Maciaszek-Sharma
2020-10-02 13:43:26 +02:00
2 changed files with 38 additions and 0 deletions

View File

@@ -16,6 +16,8 @@
package org.springframework.cloud.client.loadbalancer;
import java.util.Objects;
import org.springframework.core.style.ToStringCreator;
/**
@@ -52,4 +54,21 @@ public class DefaultRequest<T> implements Request<T> {
return to.toString();
}
@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (!(o instanceof DefaultRequest)) {
return false;
}
DefaultRequest<?> that = (DefaultRequest<?>) o;
return Objects.equals(context, that.context);
}
@Override
public int hashCode() {
return Objects.hash(context);
}
}

View File

@@ -16,6 +16,8 @@
package org.springframework.cloud.client.loadbalancer;
import java.util.Objects;
import org.springframework.core.style.ToStringCreator;
/**
@@ -55,4 +57,21 @@ public class DefaultRequestContext extends HintRequestContext {
return to.toString();
}
@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (!(o instanceof DefaultRequestContext)) {
return false;
}
DefaultRequestContext that = (DefaultRequestContext) o;
return Objects.equals(clientRequest, that.clientRequest);
}
@Override
public int hashCode() {
return Objects.hash(clientRequest);
}
}