Merge pull request #809 from project-sunbird/release-4.7.0

Issue #SB-29374 merge: From release-4.7.0 to release-4.8.0

Merge pull request #809 from project-sunbird/release-4.7.0
Issue #SB-29374 merge: From release-4.7.0 to release-4.8.0
744755f3 · Mahesh Kumar Gangula · GitHub · 381527dd · 1241b1af · 744755f3
Unverified Commit 744755f3 authored 2 years ago by Mahesh Kumar Gangula Committed by GitHub 2 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 4 additions and 3 deletions
+4 -3
--- a/content-api/hierarchy-manager/src/main/scala/org/sunbird/managers/HierarchyManager.scala
+++ b/content-api/hierarchy-manager/src/main/scala/org/sunbird/managers/HierarchyManager.scala
@@ -453,8 +453,9 @@ object HierarchyManager {
        responseFuture.map(response => {
            if (!ResponseHandler.checkError(response)) {
                val relationalMetadataString = response.getResult.toMap.getOrDefault("relational_metadata", "").asInstanceOf[String]
-                if (StringUtils.isNotEmpty(relationalMetadataString)) {
-                    Future(JsonUtils.deserialize(relationalMetadataString, classOf[java.util.Map[String, AnyRef]]).toMap)
+                if (StringUtils.isNotEmpty(relationalMetadataString) && !relationalMetadataString.trim.isBlank) {
+                    val relMetadataJavaMap = JsonUtils.deserialize(relationalMetadataString, classOf[java.util.Map[String, AnyRef]])
+                   if(relMetadataJavaMap != null && relMetadataJavaMap.size()>0) Future(relMetadataJavaMap.toMap) else Future(Map[String, AnyRef]())
                } else
                    Future(Map[String, AnyRef]())
            } else {
@@ -464,7 +465,7 @@ object HierarchyManager {
                responseFuture.map(response => {
                    if (!ResponseHandler.checkError(response)) {
                        val relationalMetadataString = response.getResult.toMap.getOrDefault("relational_metadata", "").asInstanceOf[String]
-                        if (StringUtils.isNotEmpty(relationalMetadataString)) {
+                        if (StringUtils.isNotEmpty(relationalMetadataString) && !relationalMetadataString.trim.isBlank) {
                            Future(JsonUtils.deserialize(relationalMetadataString, classOf[java.util.Map[String, AnyRef]]).toMap)
                        } else
                            Future(Map[String, AnyRef]())