COH-27674 - Regenerate gRPC Python stubs using 22.06.4 proto files and use release 22.06.4 (#4)

Author: dhirupandey

Makefile

@@ -106,9 +106,12 @@ build-test-images: ## Build the Test images
 .PHONY: generate-proto
 generate-proto:  ## Generate Proto Files
 	mkdir -p $(PROTO_DIR) || true
-	curl -o $(PROTO_DIR)/services.proto https://raw.githubusercontent.com/oracle/coherence/v21.12/prj/coherence-grpc/src/main/proto/services.proto
-	curl -o $(PROTO_DIR)/messages.proto https://raw.githubusercontent.com/oracle/coherence/v21.12/prj/coherence-grpc/src/main/proto/messages.proto
+	curl -o $(PROTO_DIR)/services.proto https://raw.githubusercontent.com/oracle/coherence/22.06.4/prj/coherence-grpc/src/main/proto/services.proto
+	curl -o $(PROTO_DIR)/messages.proto https://raw.githubusercontent.com/oracle/coherence/22.06.4/prj/coherence-grpc/src/main/proto/messages.proto
 	python -m grpc_tools.protoc --proto_path=$(CURRDIR)/etc/proto --python_out=$(CURRDIR)/coherence --grpc_python_out=$(CURRDIR)/coherence $(CURRDIR)/etc/proto/messages.proto $(CURRDIR)/etc/proto/services.proto
+	sed -e 's/import messages_pb2 as messages__pb2/import coherence.messages_pb2 as messages__pb2/' \
+		< $(CURRDIR)/coherence/services_pb2_grpc.py > $(CURRDIR)/coherence/services_pb2_grpc.py.out
+	mv $(CURRDIR)/coherence/services_pb2_grpc.py.out $(CURRDIR)/coherence/services_pb2_grpc.py
 
 # ----------------------------------------------------------------------------------------------------------------------
 # Run tests with code coverage

coherence/client.py

@@ -34,7 +34,7 @@
 from .comparator import Comparator
 from .event import MapLifecycleEvent, MapListener, SessionLifecycleEvent
 from .filter import AlwaysFilter, Filter
-from .messages_pb2 import PageRequest
+from .messages_pb2 import PageRequest  # type: ignore
 from .processor import EntryProcessor
 from .serialization import Serializer, SerializerRegistry
 from .services_pb2_grpc import NamedCacheServiceStub

coherence/event.py

@@ -16,7 +16,7 @@
 
 import coherence.client
 from coherence.filter import Filter, Filters, MapEventFilter
-from coherence.messages_pb2 import MapEventResponse, MapListenerRequest, MapListenerResponse
+from coherence.messages_pb2 import MapEventResponse, MapListenerRequest, MapListenerResponse  # type: ignore
 from coherence.serialization import Serializer
 from coherence.services_pb2_grpc import NamedCacheServiceStub
 from coherence.util import RequestFactory

coherence/messages_pb2.py

@@ -10,7 +10,7 @@
 from .aggregator import EntryAggregator
 from .comparator import Comparator
 from .filter import Filter, Filters, MapEventFilter
-from .messages_pb2 import (
+from .messages_pb2 import (  # type: ignore
     AggregateRequest,
     ClearRequest,
     ContainsKeyRequest,

coherence/services_pb2.py

@@ -34,7 +34,7 @@
     <maven.compiler.target>8</maven.compiler.target>
 
     <coherence.group.id>com.oracle.coherence.ce</coherence.group.id>
-    <coherence.version>22.06.2</coherence.version>
+    <coherence.version>22.06.4</coherence.version>
 
     <!-- The version of Coherence to use in the test images -->
     <coherence.test.groupId>com.oracle.coherence.ce</coherence.test.groupId>

coherence/util.py

@@ -14,7 +14,7 @@ set -e
 
 echo "Coherence CE 22.06.2"
 COHERENCE_CLIENT_REQUEST_TIMEOUT=180.0 \
-  COHERENCE_VERSION=22.06.2 \
+  COHERENCE_VERSION=22.06.4 \
   make clean test-cluster-shutdown remove-app-images build-test-images test-cluster-startup just-wait test
 
 echo "Coherence CE 22.06.2 with SSL"
@@ -23,5 +23,5 @@ RUN_SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true \
   COHERENCE_TLS_CLIENT_CERT=$(pwd)/tests/utils/certs/star-lord.crt \
   COHERENCE_TLS_CLIENT_KEY=$(pwd)/tests/utils/certs/star-lord.pem \
   COHERENCE_CLIENT_REQUEST_TIMEOUT=180.0 \
-  COHERENCE_VERSION=22.06.2 PROFILES=,secure make clean certs test-cluster-shutdown remove-app-images \
+  COHERENCE_VERSION=22.06.4 PROFILES=,secure make clean certs test-cluster-shutdown remove-app-images \
                                                   build-test-images test-cluster-startup just-wait test

tests/java/pom.xml

@@ -299,7 +299,6 @@ async def test_values_filtered(setup_and_teardown: NamedCache[str, str]) -> None
 
 # noinspection PyShadowingNames
 @pytest.mark.asyncio
-@pytest.mark.skip
 async def test_values_paged(setup_and_teardown: NamedCache[str, str]) -> None:
     cache: NamedCache[str, str] = setup_and_teardown