fix: Update HierarchyManager and ObjectCategoryDefinitionActor for Scala 2.13 compatibility and improve error handling

Author: chethann007

content-api/hierarchy-manager/src/main/scala/org/sunbird/managers/HierarchyManager.scala

@@ -371,8 +371,8 @@ object HierarchyManager {
             oec.graphService.saveExternalProps(req)
         }).flatMap(f => f).recoverWith {
             case clientException: ClientException => if(clientException.getMessage.equalsIgnoreCase("Validation Errors")) {
-                Future(ResponseHandler.ERROR(ResponseCode.CLIENT_ERROR, ResponseCode.CLIENT_ERROR.name(), clientException.getMessages.asScala.mkString(",")))
-            } else throw clientException
+                    Future(ResponseHandler.ERROR(ResponseCode.CLIENT_ERROR, ResponseCode.CLIENT_ERROR.name(), clientException.getMessages.asScala.mkString(",")))
+                } else throw clientException
             case e: Exception =>
                 Future(ResponseHandler.ERROR(ResponseCode.SERVER_ERROR, ResponseCode.SERVER_ERROR.name(), e.getMessage))
         }
@@ -391,9 +391,9 @@ object HierarchyManager {
             existingLeafNodes.map(en => {
                 leafNodeMap.get(en._1).put("index", en._2.get("index").asInstanceOf[Integer])
             })
-            filteredLeafNodes = childList.asScala.filter(existingLeafNode => {
+            filteredLeafNodes = new util.ArrayList[java.util.Map[String, AnyRef]](childList.asScala.filter(existingLeafNode => {
                 !leafNodeIds.asScala.contains(existingLeafNode.get("identifier").asInstanceOf[String])
-            }).toList.asJava
+            }).toList.asJava)
             maxIndex = childMap.values.toList.map(child => child.get("index").asInstanceOf[Integer]).max
         }
         leafNodeIds.asScala.foreach(id => {
@@ -454,7 +454,7 @@ object HierarchyManager {
                 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.asScala.toMap) else Future(Map[String, AnyRef]())
-                } else
+                } else 
                     Future(Map[String, AnyRef]())
             } else {
                 val req = new Request(request)

taxonomy-api/taxonomy-actors/src/main/scala/org/sunbird/actors/ObjectCategoryDefinitionActor.scala

@@ -84,6 +84,15 @@ class ObjectCategoryDefinitionActor @Inject()(implicit oec: OntologyEngineContex
 				} else
 					throw e
 			}
+			case e: CompletionException if e.getCause.isInstanceOf[ResourceNotFoundException] => {
+				val id = request.get(Constants.IDENTIFIER).asInstanceOf[String]
+				println("ObjectCategoryDefinitionActor ::: read ::: node not found with id :" + id + " | Fetching node with _all")
+				if (StringUtils.equalsAnyIgnoreCase("POST", requestMethod) && !StringUtils.endsWithIgnoreCase(id, "_all")) {
+					request.put(Constants.IDENTIFIER, id.replace(id.substring(id.lastIndexOf("_") + 1), "all"))
+					DataNode.read(request)
+				} else
+					throw e.getCause
+			}
 			case ex: Throwable => throw ex
 		} map (node => {
 			val metadata: util.Map[String, AnyRef] = NodeUtil.serialize(node, fields, request.getContext.get(Constants.SCHEMA_NAME).asInstanceOf[String], request.getContext.get(Constants.VERSION).asInstanceOf[String])