Sonar Cloud Fixes (#42)

Author: rlubke

examples/aggregators.py

@@ -38,26 +38,26 @@ async def do_run() -> None:
 
     session: Session = await Session.create()
     try:
-        namedMap: NamedMap[int, Hobbit] = await session.get_map("aggregation-test")
+        named_map: NamedMap[int, Hobbit] = await session.get_map("aggregation-test")
 
-        await namedMap.clear()
+        await named_map.clear()
 
-        await namedMap.put_all(person_data)
+        await named_map.put_all(person_data)
 
-        distinct_hobbies: List[str] = await namedMap.aggregate(Aggregators.distinct("hobbies"))
+        distinct_hobbies: List[str] = await named_map.aggregate(Aggregators.distinct("hobbies"))
         print("Distinct hobbies :", distinct_hobbies)
 
-        count: int = await namedMap.aggregate(Aggregators.count())
+        count: int = await named_map.aggregate(Aggregators.count())
         print("Number of Hobbits :", count)
 
-        over_forty: int = await namedMap.aggregate(Aggregators.count(), filter=Filters.greater("age", 40))
+        over_forty: int = await named_map.aggregate(Aggregators.count(), filter=Filters.greater("age", 40))
         print("Number of Hobbits older than 40 :", over_forty)
 
-        avg_under_forty: Decimal = await namedMap.aggregate(Aggregators.average("age"), filter=Filters.less("age", 40))
+        avg_under_forty: Decimal = await named_map.aggregate(Aggregators.average("age"), filter=Filters.less("age", 40))
         print("Average age of Hobbits under 40 :", int(avg_under_forty))
 
         print("The oldest Hobbit for each hobby ...")
-        results: dict[str, int] = await namedMap.aggregate(Aggregators.group_by("hobbies", Aggregators.max("age")))
+        results: dict[str, int] = await named_map.aggregate(Aggregators.group_by("hobbies", Aggregators.max("age")))
         for hobby, age in results.items():
             print("Hobby: ", hobby, "Max age: ", age)
     finally:

examples/basics.py

@@ -16,22 +16,22 @@ async def do_run() -> None:
     """
     session: Session = await Session.create()
     try:
-        namedMap: NamedMap[int, str] = await session.get_map("my-map")
+        named_map: NamedMap[int, str] = await session.get_map("my-map")
 
         print("Put key 1; value one")
-        await namedMap.put(1, "one")
+        await named_map.put(1, "one")
 
-        print("Value for key 1 is :", await namedMap.get(1))
+        print("Value for key 1 is :", await named_map.get(1))
 
-        print("NamedMap size is :", await namedMap.size())
+        print("NamedMap size is :", await named_map.size())
 
-        print("Updating value of key 1 to ONE from ", await namedMap.put(1, "ONE"))
+        print("Updating value of key 1 to ONE from ", await named_map.put(1, "ONE"))
 
-        print("Value for key 1 is :", await namedMap.get(1))
+        print("Value for key 1 is :", await named_map.get(1))
 
-        print("Removing key 1, current value :", await namedMap.remove(1))
+        print("Removing key 1, current value :", await named_map.remove(1))
 
-        print("NamedMap size is :", await namedMap.size())
+        print("NamedMap size is :", await named_map.size())
     finally:
         await session.close()
 

examples/events.py

@@ -17,69 +17,69 @@ async def do_run() -> None:
     """
     session: Session = await Session.create()
     try:
-        namedMap: NamedMap[int, str] = await session.get_map("listeners-map")
-        await namedMap.put(1, "1")
+        named_map: NamedMap[int, str] = await session.get_map("listeners-map")
+        await named_map.put(1, "1")
 
         print("NamedMap lifecycle events")
 
-        namedMap.on(MapLifecycleEvent.RELEASED, lambda x: print("RELEASED", x))
-        namedMap.on(MapLifecycleEvent.TRUNCATED, lambda x: print("TRUNCATE", x))
-        namedMap.on(MapLifecycleEvent.DESTROYED, lambda x: print("DESTROYED", x))
+        named_map.on(MapLifecycleEvent.RELEASED, lambda x: print("RELEASED", x))
+        named_map.on(MapLifecycleEvent.TRUNCATED, lambda x: print("TRUNCATE", x))
+        named_map.on(MapLifecycleEvent.DESTROYED, lambda x: print("DESTROYED", x))
 
         print("Truncating the NamedMap; this should generate an event ...")
-        await namedMap.truncate()
+        await named_map.truncate()
         await asyncio.sleep(1)
 
         print("Releasing the NamedMap; this should generate an event ...")
-        namedMap.release()
+        named_map.release()
         await asyncio.sleep(1)
 
         print("Destroying the NamedMap; this should generate an event ...")
-        await namedMap.destroy()
+        await named_map.destroy()
         await asyncio.sleep(1)
 
         print("\n\nNamedMap entry events")
 
-        namedMap = await session.get_map("listeners-map")
+        named_map = await session.get_map("listeners-map")
 
         listener1: MapListener[int, str] = MapListener()
         listener1.on_any(lambda e: print(e))
 
         print("Added listener for all events")
         print("Events will be generated when an entry is inserted, updated, and removed")
-        await namedMap.add_map_listener(listener1)
+        await named_map.add_map_listener(listener1)
 
-        await namedMap.put(1, "1")
-        await namedMap.put(1, "2")
-        await namedMap.remove(1)
+        await named_map.put(1, "1")
+        await named_map.put(1, "2")
+        await named_map.remove(1)
         await asyncio.sleep(1)
 
-        await namedMap.remove_map_listener(listener1)
+        await named_map.remove_map_listener(listener1)
 
         print("\nAdded listener for all entries, but only when they are inserted")
-        filter = Filters.event(Filters.always(), MapEventFilter.INSERTED)
-        await namedMap.add_map_listener(listener1, filter)
+        ins_filter = Filters.event(Filters.always(), MapEventFilter.INSERTED)
+        await named_map.add_map_listener(listener1, ins_filter)
 
-        await namedMap.put(1, "1")
-        await namedMap.put(1, "2")
-        await namedMap.remove(1)
+        await named_map.put(1, "1")
+        await named_map.put(1, "2")
+        await named_map.remove(1)
         await asyncio.sleep(1)
 
-        await namedMap.remove_map_listener(listener1, filter)
+        await named_map.remove_map_listener(listener1, ins_filter)
 
         print("\nAdded listener for entries with a length larger than one, but only when they are updated or removed")
-        filter = Filters.event(Filters.greater("length()", 1), MapEventFilter.UPDATED | MapEventFilter.DELETED)
-        await namedMap.add_map_listener(listener1, filter)
+        upd_del_filter = Filters.event(Filters.greater("length()", 1), MapEventFilter.UPDATED | MapEventFilter.DELETED)
+        await named_map.add_map_listener(listener1, upd_del_filter)
 
         for i in range(12):
-            await namedMap.put(i, str(i))
-            await namedMap.put(i, str(i + 1))
-            await namedMap.remove(i)
+            await named_map.put(i, str(i))
+            await named_map.put(i, str(i + 1))
+            await named_map.remove(i)
 
         await asyncio.sleep(1)
 
-        await namedMap.remove_map_listener(listener1, filter)
-        await namedMap.clear()
+        await named_map.remove_map_listener(listener1, upd_del_filter)
+        await named_map.clear()
     finally:
         await session.close()
 

examples/filters.py

@@ -31,29 +31,29 @@ async def do_run() -> None:
     session: Session = await Session.create()
     try:
         homes: List[str] = ["Hobbiton", "Buckland", "Frogmorton", "Stock"]
-        namedMap: NamedMap[int, Hobbit] = await session.get_map("hobbits")
+        named_map: NamedMap[int, Hobbit] = await session.get_map("hobbits")
 
-        await namedMap.clear()
+        await named_map.clear()
 
         num_hobbits: int = 20
         print("Adding", num_hobbits, "random Hobbits ...")
         for i in range(num_hobbits):
-            await namedMap.put(i, Hobbit(i, "Hobbit-" + str(i), 15 + i, homes[i % 4]))
+            await named_map.put(i, Hobbit(i, "Hobbit-" + str(i), 15 + i, homes[i % 4]))
 
-        print("NamedMap size is :", await namedMap.size())
+        print("NamedMap size is :", await named_map.size())
 
         print("Retrieve the Hobbits between the ages of 17 and 21 ...")
-        async for entry in namedMap.entries(Filters.between("age", 17, 21)):
+        async for entry in named_map.entries(Filters.between("age", 17, 21)):
             print("Key :", entry.key, ", Value :", entry.value)
 
         print("Retrieve the Hobbits between the ages of 17 and 30 and live in Hobbiton ...")
         query_filter: Filter = Filters.between("age", 17, 30).And(Filters.equals("home", "Hobbiton"))
-        async for entry in namedMap.entries(query_filter):
+        async for entry in named_map.entries(query_filter):
             print("Key :", entry.key, ", Value :", entry.value)
 
         print("Retrieve the Hobbits between the ages of 17 and 25 who live in Hobbiton or Frogmorton")
         query_filter = Filters.between("age", 17, 25).And(Filters.is_in("home", {"Hobbiton", "Frogmorton"}))
-        async for entry in namedMap.entries(query_filter):
+        async for entry in named_map.entries(query_filter):
             print("Key :", entry.key, ", Value :", entry.value)
 
     finally:

examples/processors.py

@@ -28,42 +28,42 @@ async def do_run() -> None:
     """
     session: Session = await Session.create()
     try:
-        namedMap: NamedMap[int, Hobbit] = await session.get_map("hobbits")
+        named_map: NamedMap[int, Hobbit] = await session.get_map("hobbits")
 
-        await namedMap.clear()
+        await named_map.clear()
 
         hobbit: Hobbit = Hobbit(1, "Bilbo", 111)
         print("Add new hobbit :", hobbit)
-        await namedMap.put(hobbit.id, hobbit)
+        await named_map.put(hobbit.id, hobbit)
 
-        print("NamedMap size is :", await namedMap.size())
+        print("NamedMap size is :", await named_map.size())
 
-        print("Hobbit from get() :", await namedMap.get(hobbit.id))
+        print("Hobbit from get() :", await named_map.get(hobbit.id))
 
         print("Update Hobbit using processor ...")
-        await namedMap.invoke(hobbit.id, Processors.update("age", 112))
+        await named_map.invoke(hobbit.id, Processors.update("age", 112))
 
-        print("Updated Hobbit is :", await namedMap.get(hobbit.id))
+        print("Updated Hobbit is :", await named_map.get(hobbit.id))
 
         hobbit2: Hobbit = Hobbit(2, "Frodo", 50)
 
         print("Add new hobbit :", hobbit2)
-        await namedMap.put(hobbit2.id, hobbit2)
+        await named_map.put(hobbit2.id, hobbit2)
 
-        print("NamedMap size is :", await namedMap.size())
+        print("NamedMap size is :", await named_map.size())
 
         print("Sending all Hobbits ten years into the future!")
         keys: List[int] = []
-        async for entry in namedMap.invoke_all(Processors.increment("age", 10)):
+        async for entry in named_map.invoke_all(Processors.increment("age", 10)):
             keys.append(entry.key)
             print("Updated age of Hobbit with id ", entry.key, "to", entry.value)
 
         print("Displaying all updated Hobbits ...")
-        async for result in namedMap.get_all(set(keys)):
+        async for result in named_map.get_all(set(keys)):
             print(result.value)
 
-        await namedMap.remove(hobbit.id)
-        await namedMap.remove(hobbit2.id)
+        await named_map.remove(hobbit.id)
+        await named_map.remove(hobbit2.id)
     finally:
         await session.close()
 

examples/python_object_keys_and_values.py

@@ -10,14 +10,14 @@
 
 @dataclass
 class AccountKey:
-    accountId: int
-    accountType: str
+    account_id: int
+    account_type: str
 
 
 @dataclass
 class Account:
-    accountId: int
-    accountType: str
+    account_id: int
+    account_type: str
     name: str
     balance: float
 
@@ -36,7 +36,7 @@ async def do_run() -> None:
         await namedMap.clear()
 
         new_account_key: AccountKey = AccountKey(100, "savings")
-        new_account: Account = Account(new_account_key.accountId, new_account_key.accountType, "John Doe", 100000.00)
+        new_account: Account = Account(new_account_key.account_id, new_account_key.account_type, "John Doe", 100000.00)
 
         print(f"Add new account {new_account} with key {new_account_key}")
         await namedMap.put(new_account_key, new_account)

src/coherence/client.py

@@ -55,13 +55,15 @@
 def _pre_call_cache(func):
     def inner(self, *args, **kwargs):
         if not self.active:
-            raise Exception("Cache [] has been " + "released" if self.released else "destroyed")
+            raise RuntimeError("Cache [] has been " + "released" if self.released else "destroyed")
 
         return func(self, *args, **kwargs)
 
     async def inner_async(self, *args, **kwargs):
         if not self.active:
-            raise Exception("Cache [{}] has been {}.".format(self.name, "released" if self.released else "destroyed"))
+            raise RuntimeError(
+                "Cache [{}] has been {}.".format(self.name, "released" if self.released else "destroyed")
+            )
 
         # noinspection PyProtectedMember
         await self._session._wait_for_ready()
@@ -77,13 +79,13 @@ async def inner_async(self, *args, **kwargs):
 def _pre_call_session(func):
     def inner(self, *args, **kwargs):
         if self._closed:
-            raise Exception("Session has been closed.")
+            raise RuntimeError("Session has been closed.")
 
         return func(self, *args, **kwargs)
 
     async def inner_async(self, *args, **kwargs):
         if self._closed:
-            raise Exception("Session has been closed.")
+            raise RuntimeError("Session has been closed.")
 
         return await func(self, *args, **kwargs)
 
@@ -673,9 +675,9 @@ async def aggregate(
             return cast(R, float(value))
         elif isinstance(aggregator, PriorityAggregator):
             pri_agg: PriorityAggregator[R] = aggregator
-            if isinstance(pri_agg.aggregator, SumAggregator) and isinstance(value, str):
-                return cast(R, float(value))
-            elif isinstance(pri_agg.aggregator, AverageAggregator) and isinstance(value, str):
+            if (
+                isinstance(pri_agg.aggregator, AverageAggregator) or isinstance(pri_agg.aggregator, SumAggregator)
+            ) and isinstance(value, str):
                 return cast(R, float(value))
         # end compatibility with 22.06
 
@@ -752,19 +754,17 @@ def _setup_event_handlers(self) -> None:
 
         # noinspection PyProtectedMember
         def on_destroyed(name: str) -> None:
-            if name == cache_name:
-                if not this.destroyed:
-                    this._events_manager._close()
-                    this._destroyed = True
-                    emitter.emit(MapLifecycleEvent.DESTROYED.value, name)
+            if name == cache_name and not this.destroyed:
+                this._events_manager._close()
+                this._destroyed = True
+                emitter.emit(MapLifecycleEvent.DESTROYED.value, name)
 
         # noinspection PyProtectedMember
         def on_released(name: str) -> None:
-            if name == cache_name:
-                if not this.released:
-                    this._events_manager._close()
-                    this._released = True
-                    emitter.emit(MapLifecycleEvent.RELEASED.value, name)
+            if name == cache_name and not this.released:
+                this._events_manager._close()
+                this._released = True
+                emitter.emit(MapLifecycleEvent.RELEASED.value, name)
 
         def on_truncated(name: str) -> None:
             if name == cache_name:
@@ -1665,7 +1665,6 @@ async def __anext__(self) -> T:
                     self._cookie = item.value if self._keys else item.cookie
                     if self._cookie == b"":
                         self._exhausted = True  # processing the last page
-                    continue
                 else:
                     return self._result_handler(self._serializer, item)