update java-control-plane

Author: Ferdudas97

build.gradle

@@ -47,7 +47,7 @@ allprojects {
 
     project.ext.versions = [
             kotlin            : '1.6.10',
-            java_controlplane : '0.1.32',
+            java_controlplane : '0.1.33-delta-xds-non-breaking-slonka-hash-bytes-SNAPSHOT',
             spring_boot       : '2.3.4.RELEASE',
             grpc              : '1.21.0',
             jaxb              : '2.3.1',

envoy-control-core/src/main/java/pl/allegro/tech/servicemesh/envoycontrol/SimpleCache.java

@@ -186,11 +186,7 @@ public DeltaWatch createDeltaWatch(
         Preconditions.checkNotNull(requestResourceType, "unsupported type URL %s",
             request.getTypeUrl());
         T group;
-        if (request.v3Request() != null) {
-            group = groups.hash(request.v3Request().getNode());
-        } else {
-            group = groups.hash(request.v2Request().getNode());
-        }
+        group = groups.hash(request.v3Request().getNode());
 
         // even though we're modifying, we take a readLock to allow multiple watches to be created in parallel since it
         // doesn't conflict

envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/server/callbacks/MetricsDiscoveryServerCallbacks.kt

@@ -50,7 +50,7 @@ class MetricsDiscoveryServerCallbacks(private val meterRegistry: MeterRegistry)
         connectionsByType(typeUrl).decrementAndGet()
     }
 
-    override fun onV3StreamRequest(streamId: Long, request: DiscoveryRequestV3) {
+    override fun onV3StreamRequest(streamId: Long, request: V3DiscoveryRequest) {
         meterRegistry.counter("grpc.requests.${StreamType.fromTypeUrl(request.typeUrl).name.toLowerCase()}")
             .increment()
     }