Fixes #2073

Author: okorach-sonar

sonar/applications.py

@@ -604,8 +604,19 @@ def search_by_name(endpoint: pf.Platform, name: str) -> dict[str, Application]:
 def convert_app_json(old_app_json: dict[str, Any]) -> dict[str, Any]:
     """Converts sonar-config old JSON report format to new format for a single application"""
     new_json = common_json_helper.convert_common_fields(old_app_json.copy())
-    if "branches" in old_app_json:
-        new_json["branches"] = util.dict_to_list(old_app_json["branches"], "name")
+    if "branches" not in new_json:
+        return new_json
+    log.info("CONVERT %s", util.json_dump(new_json["branches"]))
+    for br, data in new_json["branches"].items():
+        log.info("CONVERT PROJS %s", util.json_dump(new_json["branches"][br].get("projects", {})))
+        if "projects" not in data:
+            continue
+        new_json["branches"][br]["projects"] = util.dict_to_list(new_json["branches"][br]["projects"], "key", "branch")
+        for proj_data in new_json["branches"][br]["projects"]:
+            if proj_data.get("branch", None) in ("__default__", c.DEFAULT_BRANCH):
+                proj_data.pop("branch")
+    new_json["branches"] = util.dict_to_list(new_json["branches"], "name")
+    log.info("RETURN %s", util.json_dump(new_json))
     return new_json