Refactoring

Author: okorach-sonar

sonar/components.py

@@ -66,10 +66,8 @@ def __init__(self, endpoint: pf.Platform, key: str, data: types.ApiPayload = Non
             self.reload(data)
 
     def reload(self, data: types.ApiPayload) -> Component:
-        log.debug("Reloading %s with %s", str(self), utilities.json_dump(data))
-        if not self.sq_json:
-            self.sq_json = {}
-        self.sq_json.update(data)
+        """Loads a SonarQube API JSON payload in a Component"""
+        super().reload(data)
         if "name" in data:
             self.name = data["name"]
         if "visibility" in data:

sonar/sqobject.py

@@ -89,12 +89,10 @@ def clear_cache(cls, endpoint: Optional[object] = None) -> None:
         except AttributeError:
             pass
 
-    def reload(self, data: types.ObjectJsonRepr) -> None:
-        """Reload a Sonar object with its JSON representation"""
-        if self.sq_json is None:
-            self.sq_json = data
-        else:
-            self.sq_json.update(data)
+    def reload(self, data: types.ApiPayload) -> None:
+        """Loads a SonarQube API JSON payload in a SonarObject"""
+        log.debug("%s: Reloading with %s", str(self), utilities.json_dump(data))
+        self.sq_json = (self.sq_json or {}) | data
 
     def base_url(self, local: bool = True) -> str:
         """Returns the platform base URL"""