rename onStreamRequest on DiscoveryServerCallbacks

Signed-off-by: Michael Puncel <mpuncel@squareup.com>
envoyproxy · Aug 8, 2020 · 3a07190 · 3a07190
1 parent 243e2cd
commit 3a07190
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 25 deletions.
diff --git a/server/src/main/java/io/envoyproxy/controlplane/server/V2DiscoveryServer.java b/server/src/main/java/io/envoyproxy/controlplane/server/V2DiscoveryServer.java
@@ -134,7 +134,7 @@ protected XdsRequest wrapXdsRequest(DiscoveryRequest request) {
  @Override
  protected void runStreamRequestCallbacks(long streamId, DiscoveryRequest discoveryRequest) {
  callbacks.forEach(
- cb -> cb.onStreamRequest(streamId, discoveryRequest));
+ cb -> cb.onV2StreamRequest(streamId, discoveryRequest));
  }
 
  @Override

diff --git a/.../src/main/java/io/envoyproxy/controlplane/server/callback/SnapshotCollectingCallback.java b/.../src/main/java/io/envoyproxy/controlplane/server/callback/SnapshotCollectingCallback.java
@@ -80,7 +80,7 @@ public SnapshotCollectingCallback(SnapshotCache<T, X> snapshotCache,
  }
 
  @Override
- public synchronized void onStreamRequest(long streamId, DiscoveryRequest request) {
+ public synchronized void onV2StreamRequest(long streamId, DiscoveryRequest request) {
  T groupIdentifier = nodeGroup.hash(request.getNode());
  updateState(streamId, groupIdentifier);
  }

diff --git a/server/src/test/java/io/envoyproxy/controlplane/server/V2DiscoveryServerAdsIT.java b/server/src/test/java/io/envoyproxy/controlplane/server/V2DiscoveryServerAdsIT.java
@@ -50,7 +50,7 @@ public void onStreamOpen(long streamId, String typeUrl) {
  }
 
  @Override
- public void onStreamRequest(long streamId, DiscoveryRequest request) {
+ public void onV2StreamRequest(long streamId, DiscoveryRequest request) {
  onStreamRequestLatch.countDown();
  }
 

diff --git a/...src/test/java/io/envoyproxy/controlplane/server/V2DiscoveryServerAdsWarmingClusterIT.java b/...src/test/java/io/envoyproxy/controlplane/server/V2DiscoveryServerAdsWarmingClusterIT.java
@@ -69,7 +69,7 @@ public void onStreamOpen(long streamId, String typeUrl) {
  }
 
  @Override
- public void onStreamRequest(long streamId, DiscoveryRequest request) {
+ public void onV2StreamRequest(long streamId, DiscoveryRequest request) {
  onStreamRequestLatch.countDown();
  }
 

diff --git a/server/src/test/java/io/envoyproxy/controlplane/server/V2DiscoveryServerTest.java b/server/src/test/java/io/envoyproxy/controlplane/server/V2DiscoveryServerTest.java
@@ -452,8 +452,8 @@ public void onStreamOpen(long streamId, String typeUrl) {
  }
 
  @Override
- public void onStreamRequest(long streamId, DiscoveryRequest request) {
- super.onStreamRequest(streamId, request);
+ public void onV2StreamRequest(long streamId, DiscoveryRequest request) {
+ super.onV2StreamRequest(streamId, request);
 
  streamRequestLatch.get().countDown();
  }
@@ -627,8 +627,8 @@ public void onStreamOpen(long streamId, String typeUrl) {
  }
 
  @Override
- public void onStreamRequest(long streamId, DiscoveryRequest request) {
- super.onStreamRequest(streamId, request);
+ public void onV2StreamRequest(long streamId, DiscoveryRequest request) {
+ super.onV2StreamRequest(streamId, request);
 
  streamRequestLatches.get(request.getTypeUrl()).countDown();
  }
@@ -872,8 +872,8 @@ public Watch createWatch(boolean ads, XdsRequest request, Set<String> knownResou
  public void testCallbacksRequestException() throws InterruptedException {
  MockDiscoveryServerCallbacks callbacks = new MockDiscoveryServerCallbacks() {
  @Override
- public void onStreamRequest(long streamId, DiscoveryRequest request) {
- super.onStreamRequest(streamId, request);
+ public void onV2StreamRequest(long streamId, DiscoveryRequest request) {
+ super.onV2StreamRequest(streamId, request);
  throw new RequestException(Status.INVALID_ARGUMENT.withDescription("request not valid"));
  }
  };
@@ -914,8 +914,8 @@ public void onStreamRequest(long streamId, DiscoveryRequest request) {
  public void testCallbacksOtherStatusException() throws InterruptedException {
  MockDiscoveryServerCallbacks callbacks = new MockDiscoveryServerCallbacks() {
  @Override
- public void onStreamRequest(long streamId, DiscoveryRequest request) {
- super.onStreamRequest(streamId, request);
+ public void onV2StreamRequest(long streamId, DiscoveryRequest request) {
+ super.onV2StreamRequest(streamId, request);
  throw new StatusRuntimeException(Status.INVALID_ARGUMENT.withDescription("request not valid"));
  }
  };
@@ -1047,7 +1047,7 @@ public void onStreamOpen(long streamId, String typeUrl) {
  }
 
  @Override
- public void onStreamRequest(long streamId, DiscoveryRequest request) {
+ public void onV2StreamRequest(long streamId, DiscoveryRequest request) {
  streamRequestCount.getAndIncrement();
 
  if (request == null) {

diff --git a/...er/src/test/java/io/envoyproxy/controlplane/server/V2DiscoveryServerV3ResourcesAdsIT.java b/...er/src/test/java/io/envoyproxy/controlplane/server/V2DiscoveryServerV3ResourcesAdsIT.java
@@ -56,7 +56,7 @@ public void onStreamOpen(long streamId, String typeUrl) {
  }
 
  @Override
- public void onStreamRequest(long streamId, DiscoveryRequest request) {
+ public void onV2StreamRequest(long streamId, DiscoveryRequest request) {
  onStreamRequestLatch.countDown();
  }
 

diff --git a/...er/src/test/java/io/envoyproxy/controlplane/server/V2DiscoveryServerV3ResourcesXdsIT.java b/...er/src/test/java/io/envoyproxy/controlplane/server/V2DiscoveryServerV3ResourcesXdsIT.java
@@ -55,7 +55,7 @@ public void onStreamOpen(long streamId, String typeUrl) {
  }
 
  @Override
- public void onStreamRequest(long streamId, DiscoveryRequest request) {
+ public void onV2StreamRequest(long streamId, DiscoveryRequest request) {
  onStreamRequestLatch.countDown();
  }
 

diff --git a/server/src/test/java/io/envoyproxy/controlplane/server/V2DiscoveryServerXdsIT.java b/server/src/test/java/io/envoyproxy/controlplane/server/V2DiscoveryServerXdsIT.java
@@ -50,7 +50,7 @@ public void onStreamOpen(long streamId, String typeUrl) {
  }
 
  @Override
- public void onStreamRequest(long streamId, DiscoveryRequest request) {
+ public void onV2StreamRequest(long streamId, DiscoveryRequest request) {
  onStreamRequestLatch.countDown();
  }
 

diff --git a/server/src/test/java/io/envoyproxy/controlplane/server/V3DiscoveryServerAdsIT.java b/server/src/test/java/io/envoyproxy/controlplane/server/V3DiscoveryServerAdsIT.java
@@ -53,7 +53,8 @@ public void onStreamOpen(long streamId, String typeUrl) {
  }
 
  @Override
- public void onStreamRequest(long streamId, io.envoyproxy.envoy.api.v2.DiscoveryRequest request) {
+ public void onV2StreamRequest(long streamId,
+ io.envoyproxy.envoy.api.v2.DiscoveryRequest request) {
  throw new IllegalStateException("Unexpected v2 request in v3 test");
  }
 

diff --git a/...src/test/java/io/envoyproxy/controlplane/server/V3DiscoveryServerAdsWarmingClusterIT.java b/...src/test/java/io/envoyproxy/controlplane/server/V3DiscoveryServerAdsWarmingClusterIT.java
@@ -68,7 +68,8 @@ public void onStreamOpen(long streamId, String typeUrl) {
  }
 
  @Override
- public void onStreamRequest(long streamId, io.envoyproxy.envoy.api.v2.DiscoveryRequest request) {
+ public void onV2StreamRequest(long streamId,
+ io.envoyproxy.envoy.api.v2.DiscoveryRequest request) {
  throw new IllegalStateException("Unexpected v2 request in v3 test");
  }
 

diff --git a/server/src/test/java/io/envoyproxy/controlplane/server/V3DiscoveryServerTest.java b/server/src/test/java/io/envoyproxy/controlplane/server/V3DiscoveryServerTest.java
@@ -1051,7 +1051,8 @@ public void onStreamOpen(long streamId, String typeUrl) {
  }
 
  @Override
- public void onStreamRequest(long streamId, io.envoyproxy.envoy.api.v2.DiscoveryRequest request) {
+ public void onV2StreamRequest(long streamId,
+ io.envoyproxy.envoy.api.v2.DiscoveryRequest request) {
  throw new IllegalStateException("Unexpected v2 request in v3 test");
  }
 

diff --git a/...er/src/test/java/io/envoyproxy/controlplane/server/V3DiscoveryServerV2ResourcesAdsIT.java b/...er/src/test/java/io/envoyproxy/controlplane/server/V3DiscoveryServerV2ResourcesAdsIT.java
@@ -55,7 +55,8 @@ public void onStreamOpen(long streamId, String typeUrl) {
  }
 
  @Override
- public void onStreamRequest(long streamId, io.envoyproxy.envoy.api.v2.DiscoveryRequest request) {
+ public void onV2StreamRequest(long streamId,
+ io.envoyproxy.envoy.api.v2.DiscoveryRequest request) {
  throw new IllegalStateException("unexpected v2 request in v3 test");
  }
 

diff --git a/...er/src/test/java/io/envoyproxy/controlplane/server/V3DiscoveryServerV2ResourcesXdsIT.java b/...er/src/test/java/io/envoyproxy/controlplane/server/V3DiscoveryServerV2ResourcesXdsIT.java
@@ -55,7 +55,8 @@ public void onStreamOpen(long streamId, String typeUrl) {
  }
 
  @Override
- public void onStreamRequest(long streamId, io.envoyproxy.envoy.api.v2.DiscoveryRequest request) {
+ public void onV2StreamRequest(long streamId,
+ io.envoyproxy.envoy.api.v2.DiscoveryRequest request) {
  onStreamRequestLatch.countDown();
  }
 

diff --git a/server/src/test/java/io/envoyproxy/controlplane/server/V3DiscoveryServerXdsIT.java b/server/src/test/java/io/envoyproxy/controlplane/server/V3DiscoveryServerXdsIT.java
@@ -50,7 +50,8 @@ public void onStreamOpen(long streamId, String typeUrl) {
  }
 
  @Override
- public void onStreamRequest(long streamId, io.envoyproxy.envoy.api.v2.DiscoveryRequest request) {
+ public void onV2StreamRequest(long streamId,
+ io.envoyproxy.envoy.api.v2.DiscoveryRequest request) {
  throw new IllegalStateException("Unexpected v2 request in v3 test");
  }
 

diff --git a/.../test/java/io/envoyproxy/controlplane/server/callback/SnapshotCollectingCallbackTest.java b/.../test/java/io/envoyproxy/controlplane/server/callback/SnapshotCollectingCallbackTest.java
@@ -46,8 +46,8 @@ public void setUp() {
 
  @Test
  public void testSingleSnapshot() {
- callback.onStreamRequest(0, DiscoveryRequest.getDefaultInstance());
- callback.onStreamRequest(1, DiscoveryRequest.getDefaultInstance());
+ callback.onV2StreamRequest(0, DiscoveryRequest.getDefaultInstance());
+ callback.onV2StreamRequest(1, DiscoveryRequest.getDefaultInstance());
 
  // We have 2 references to the snapshot, this should do nothing.
  callback.deleteUnreferenced(Clock.offset(CLOCK, Duration.ofMillis(5)));
@@ -84,7 +84,7 @@ public void testAsyncCollection() throws InterruptedException {
  }
  };
 
- callback.onStreamRequest(0, DiscoveryRequest.getDefaultInstance());
+ callback.onV2StreamRequest(0, DiscoveryRequest.getDefaultInstance());
  assertThat(deleteUnreferencedLatch.await(100, TimeUnit.MILLISECONDS)).isTrue();
  assertThat(collectedGroups).isEmpty();