Merge branch 'main' into COH-32107

Author: dhirupandey

.github/workflows/release.yml

@@ -60,7 +60,7 @@ jobs:
           path: ./docs/_build
 
       - name: Download artifact
-        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e  # v4.2.1
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093  # v4.3.0
         with:
           name: github-pages
           path: .

.github/workflows/validate-nslookup.yml

@@ -21,8 +21,8 @@ jobs:
         poetry-version: ["1.8.4"]
         os: [ubuntu-latest]
         coherenceVersion:
-          - 25.03
-          - 22.06.11
+          - 25.03.1
+          - 22.06.12
         base-image:
           - gcr.io/distroless/java17-debian11
     runs-on: ${{ matrix.os }}

.github/workflows/validate.yml

@@ -21,17 +21,17 @@ jobs:
         poetry-version: ["1.8.4"]
         os: [ubuntu-latest]
         coherenceVersion:
-          - 25.03
-          - 22.06.11
+          - 25.03.1
+          - 22.06.12
         base-image:
           - gcr.io/distroless/java17-debian11
         profile:
           - ",-jakarta,javax"
           - ",jakarta,-javax"
         exclude:
-          - coherenceVersion: 25.03
+          - coherenceVersion: 25.03.1
             profile: ",-jakarta,javax"
-          - coherenceVersion: 22.06.11
+          - coherenceVersion: 22.06.12
             profile: ",jakarta,-javax"
 
     runs-on: ${{ matrix.os }}

README.md

@@ -32,7 +32,7 @@ For local development, we recommend using the Coherence CE Docker image; it cont
 everything necessary for the client to operate correctly.
 
 ```bash
-docker run -d -p 1408:1408 ghcr.io/oracle/coherence-ce:25.03
+docker run -d -p 1408:1408 ghcr.io/oracle/coherence-ce:25.03.1
 ```
 
 ## Installation

pyproject.toml

@@ -28,7 +28,7 @@ grpcio-tools = "1.70.0"
 jsonpickle = ">=3.0,<4.1"
 pymitter = ">=0.4,<1.1"
 typing-extensions = ">=4.11,<4.14"
-types-protobuf = "5.29.1.20250403"
+types-protobuf = "6.30.2.20250506"
 pympler = "1.1"
 numpy = "2.0.2"
 

src/coherence/client.py

@@ -1068,7 +1068,6 @@ def on_destroyed(name: str) -> None:
             if name == cache_name and not this.destroyed:
                 this._events_manager._close()
                 this._destroyed = True
-                this._released = True
                 emitter.emit(MapLifecycleEvent.DESTROYED.value, name)
 
         # noinspection PyProtectedMember
@@ -1289,10 +1288,13 @@ async def clear(self) -> None:
             await self._near_cache.clear()
 
     async def destroy(self) -> None:
-        self._internal_emitter.once(MapLifecycleEvent.DESTROYED.value)
-        self._internal_emitter.emit(MapLifecycleEvent.DESTROYED.value, self.name)
-        dispatcher: Dispatcher = self._request_factory.destroy_request()
-        await dispatcher.dispatch(self._stream_handler)
+        if not self._stream_handler._closed:
+            dispatcher: Dispatcher = self._request_factory.destroy_request()
+            await dispatcher.dispatch(self._stream_handler)
+            # Now do everything that is done for release
+            self._internal_emitter.once(MapLifecycleEvent.RELEASED.value)
+            self._internal_emitter.emit(MapLifecycleEvent.RELEASED.value, self.name)
+            await self._stream_handler.close()
 
     async def release(self) -> None:
         if self.active:

tests/e2e/test_client.py

@@ -495,6 +495,46 @@ def callback(n: str) -> None:
         await session.close()
 
 
+# noinspection PyShadowingNames,DuplicatedCode
+@pytest.mark.asyncio(loop_scope="function")
+async def test_cache_destroy_event() -> None:
+    session: Session = await tests.get_session()
+    cache: NamedCache[str, str] = await session.get_cache("test-" + str(int(time() * 1000)))
+    name: str = "UNSET"
+    destroy_event: Event = Event()
+    release_event: Event = Event()
+
+    def destroy_callback(n: str) -> None:
+        nonlocal name
+        name = n
+        destroy_event.set()
+
+    cache.on(MapLifecycleEvent.DESTROYED, destroy_callback)
+
+    def release_callback(n: str) -> None:
+        nonlocal name
+        name = n
+        release_event.set()
+
+    cache.on(MapLifecycleEvent.RELEASED, release_callback)
+
+    try:
+        await cache.put("A", "B")
+        await cache.put("C", "D")
+        assert await cache.size() == 2
+
+        await cache.destroy()
+        await tests.wait_for(destroy_event, EVENT_TIMEOUT)
+        await tests.wait_for(release_event, EVENT_TIMEOUT)
+
+        assert name == cache.name
+        assert cache.destroyed
+        assert cache.released
+        assert not cache.active
+    finally:
+        await session.close()
+
+
 # noinspection PyShadowingNames,DuplicatedCode,PyUnresolvedReferences
 @pytest.mark.asyncio
 async def test_add_remove_index(person_cache: NamedCache[str, Person]) -> None:
@@ -603,7 +643,7 @@ async def test_ttl_configuration(test_session: Session) -> None:
 
 @pytest.mark.asyncio
 async def test_unary_error(test_session: Session) -> None:
-    cache: NamedCache[str, str] = await test_session.get_cache("unary_error")
+    cache: NamedCache[str, dict] = await test_session.get_cache("unary_error")
 
     d = dict()
     d["@class"] = "com.foo.Bar"

tests/java/pom.xml

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