From 5111eca71b41819d76bd5f65f58a880413d80bb5 Mon Sep 17 00:00:00 2001
From: ZHANG Dapeng <zdapeng@google.com>
Date: Wed, 28 Oct 2020 17:24:23 -0700
Subject: [PATCH] rls: remove redundant request field in
 CachedRouteLookupResponse

---
 rls/src/main/java/io/grpc/rls/CachingRlsLbClient.java | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/rls/src/main/java/io/grpc/rls/CachingRlsLbClient.java b/rls/src/main/java/io/grpc/rls/CachingRlsLbClient.java
index d8e52e2efe..612c22d3fc 100644
--- a/rls/src/main/java/io/grpc/rls/CachingRlsLbClient.java
+++ b/rls/src/main/java/io/grpc/rls/CachingRlsLbClient.java
@@ -329,8 +329,6 @@ final class CachingRlsLbClient {
    * Viewer class for cached {@link RouteLookupResponse} and associated {@link ChildPolicyWrapper}.
    */
   static final class CachedRouteLookupResponse {
-    private final RouteLookupRequest request;
-
     // Should only have 1 of following 3 cache entries
     @Nullable
     private final DataCacheEntry dataCacheEntry;
@@ -340,11 +338,9 @@ final class CachingRlsLbClient {
     private final BackoffCacheEntry backoffCacheEntry;
 
     CachedRouteLookupResponse(
-        RouteLookupRequest request,
         DataCacheEntry dataCacheEntry,
         PendingCacheEntry pendingCacheEntry,
         BackoffCacheEntry backoffCacheEntry) {
-      this.request = checkNotNull(request, "request");
       this.dataCacheEntry = dataCacheEntry;
       this.pendingCacheEntry = pendingCacheEntry;
       this.backoffCacheEntry = backoffCacheEntry;
@@ -354,15 +350,15 @@ final class CachingRlsLbClient {
     }
 
     static CachedRouteLookupResponse pendingResponse(PendingCacheEntry pendingEntry) {
-      return new CachedRouteLookupResponse(pendingEntry.request, null, pendingEntry, null);
+      return new CachedRouteLookupResponse(null, pendingEntry, null);
     }
 
     static CachedRouteLookupResponse backoffEntry(BackoffCacheEntry backoffEntry) {
-      return new CachedRouteLookupResponse(backoffEntry.request, null, null, backoffEntry);
+      return new CachedRouteLookupResponse(null, null, backoffEntry);
     }
 
     static CachedRouteLookupResponse dataEntry(DataCacheEntry dataEntry) {
-      return new CachedRouteLookupResponse(dataEntry.request, dataEntry, null, null);
+      return new CachedRouteLookupResponse(dataEntry, null, null);
     }
 
     boolean hasData() {
@@ -404,7 +400,6 @@ final class CachingRlsLbClient {
     @Override
     public String toString() {
       return MoreObjects.toStringHelper(this)
-          .add("request", request)
           .add("dataCacheEntry", dataCacheEntry)
           .add("pendingCacheEntry", pendingCacheEntry)
           .add("backoffCacheEntry", backoffCacheEntry)