From 85864e853d39cbb0a3a77f59e125577c90dd6d68 Mon Sep 17 00:00:00 2001 From: Michael Puncel Date: Sat, 8 Aug 2020 19:54:50 -0400 Subject: [PATCH] rename onStreamRequest on DiscoveryServerCallbacks --- .../controlplane/server/V2DiscoveryServer.java | 2 +- .../callback/SnapshotCollectingCallback.java | 2 +- .../server/V2DiscoveryServerAdsIT.java | 2 +- .../V2DiscoveryServerAdsWarmingClusterIT.java | 2 +- .../server/V2DiscoveryServerTest.java | 18 +++++++++--------- .../V2DiscoveryServerV3ResourcesAdsIT.java | 2 +- .../V2DiscoveryServerV3ResourcesXdsIT.java | 2 +- .../server/V2DiscoveryServerXdsIT.java | 2 +- .../server/V3DiscoveryServerAdsIT.java | 3 ++- .../V3DiscoveryServerAdsWarmingClusterIT.java | 3 ++- .../server/V3DiscoveryServerTest.java | 3 ++- .../V3DiscoveryServerV2ResourcesAdsIT.java | 3 ++- .../V3DiscoveryServerV2ResourcesXdsIT.java | 3 ++- .../server/V3DiscoveryServerXdsIT.java | 3 ++- .../SnapshotCollectingCallbackTest.java | 6 +++--- 15 files changed, 31 insertions(+), 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 index bc3c56d00..1d8616282 100644 --- 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/server/src/main/java/io/envoyproxy/controlplane/server/callback/SnapshotCollectingCallback.java b/server/src/main/java/io/envoyproxy/controlplane/server/callback/SnapshotCollectingCallback.java index e6a371f58..8e2e3f55f 100644 --- a/server/src/main/java/io/envoyproxy/controlplane/server/callback/SnapshotCollectingCallback.java +++ b/server/src/main/java/io/envoyproxy/controlplane/server/callback/SnapshotCollectingCallback.java @@ -80,7 +80,7 @@ public SnapshotCollectingCallback(SnapshotCache 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 index 013d381d7..7a650472e 100644 --- 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/server/src/test/java/io/envoyproxy/controlplane/server/V2DiscoveryServerAdsWarmingClusterIT.java b/server/src/test/java/io/envoyproxy/controlplane/server/V2DiscoveryServerAdsWarmingClusterIT.java index f531cdd84..db95b8d94 100644 --- a/server/src/test/java/io/envoyproxy/controlplane/server/V2DiscoveryServerAdsWarmingClusterIT.java +++ b/server/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 index a5ff4c805..80b2a94e5 100644 --- 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 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/server/src/test/java/io/envoyproxy/controlplane/server/V2DiscoveryServerV3ResourcesAdsIT.java b/server/src/test/java/io/envoyproxy/controlplane/server/V2DiscoveryServerV3ResourcesAdsIT.java index 0bd3a7ba8..6545c7eba 100644 --- a/server/src/test/java/io/envoyproxy/controlplane/server/V2DiscoveryServerV3ResourcesAdsIT.java +++ b/server/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/server/src/test/java/io/envoyproxy/controlplane/server/V2DiscoveryServerV3ResourcesXdsIT.java b/server/src/test/java/io/envoyproxy/controlplane/server/V2DiscoveryServerV3ResourcesXdsIT.java index aeba8cc71..ff07382bb 100644 --- a/server/src/test/java/io/envoyproxy/controlplane/server/V2DiscoveryServerV3ResourcesXdsIT.java +++ b/server/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 index f83acbbb8..4203b930a 100644 --- 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 index 3424e08c3..272d0129f 100644 --- 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/server/src/test/java/io/envoyproxy/controlplane/server/V3DiscoveryServerAdsWarmingClusterIT.java b/server/src/test/java/io/envoyproxy/controlplane/server/V3DiscoveryServerAdsWarmingClusterIT.java index 40ae661ce..efd084e42 100644 --- a/server/src/test/java/io/envoyproxy/controlplane/server/V3DiscoveryServerAdsWarmingClusterIT.java +++ b/server/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 index a6a3605f7..e7d187c65 100644 --- 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/server/src/test/java/io/envoyproxy/controlplane/server/V3DiscoveryServerV2ResourcesAdsIT.java b/server/src/test/java/io/envoyproxy/controlplane/server/V3DiscoveryServerV2ResourcesAdsIT.java index 596f5031a..0f2c67849 100644 --- a/server/src/test/java/io/envoyproxy/controlplane/server/V3DiscoveryServerV2ResourcesAdsIT.java +++ b/server/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/server/src/test/java/io/envoyproxy/controlplane/server/V3DiscoveryServerV2ResourcesXdsIT.java b/server/src/test/java/io/envoyproxy/controlplane/server/V3DiscoveryServerV2ResourcesXdsIT.java index 514f6c4a0..4347a5dd3 100644 --- a/server/src/test/java/io/envoyproxy/controlplane/server/V3DiscoveryServerV2ResourcesXdsIT.java +++ b/server/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 index 336c9dfe4..8a7b3f8c0 100644 --- 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/server/src/test/java/io/envoyproxy/controlplane/server/callback/SnapshotCollectingCallbackTest.java b/server/src/test/java/io/envoyproxy/controlplane/server/callback/SnapshotCollectingCallbackTest.java index 9f535d056..d50838c1d 100644 --- a/server/src/test/java/io/envoyproxy/controlplane/server/callback/SnapshotCollectingCallbackTest.java +++ b/server/src/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();