backward compatibility shifted from datanode to contentactor

learning-api/orchestrator/src/main/java/org/sunbird/actors/ContentActor.java

@@ -15,10 +15,13 @@ import org.sunbird.graph.utils.NodeUtil;
 import org.sunbird.utils.RequestUtils;
 import scala.concurrent.Future;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+import org.sunbird.common.Platform;
+import static java.util.stream.Collectors.toList;
 
 public class ContentActor extends BaseActor {
 
@@ -75,6 +78,9 @@ public class ContentActor extends BaseActor {
                 .map(new Mapper<Node, Response>() {
                     @Override
                     public Response apply(Node node) {
+                        // Added for backward compatibility in mobile
+                        if(!StringUtils.isEmpty((String)request.getRequest().get("mode")) && !StringUtils.equals("edit", (String)request.getRequest().get("mode")))
+                            updateContentTaggedProperty(node);
                         Map<String, Object> metadata = NodeUtil.serialize(node, fields, (String) request.getContext().get("schemaName"), (String)request.getContext().get("version"));
                         metadata.put("identifier", node.getIdentifier().replace(".img", ""));
                         Response response = ResponseHandler.OK();
@@ -131,4 +137,47 @@ public class ContentActor extends BaseActor {
         }
     }
 
+    /**
+     *
+     * @param node
+     */
+    private void updateContentTaggedProperty(Node node) {
+        Boolean contentTaggingFlag = Platform.config.hasPath("content.tagging.backward_enable")?
+                Platform.config.getBoolean("content.tagging.backward_enable"): false;
+        if(contentTaggingFlag) {
+            List <String> contentTaggedKeys = Platform.config.hasPath("content.tagging.property") ?
+                    Arrays.asList(Platform.config.getString("content.tagging.property").split(",")):
+                    new ArrayList<>(Arrays.asList("subject","medium"));
+            contentTaggedKeys.forEach(contentTagKey -> {
+                if(node.getMetadata().containsKey(contentTagKey)) {
+                    List<String> prop = prepareList(node.getMetadata().get(contentTagKey));
+                    node.getMetadata().put(contentTagKey, prop.get(0));
+                }
+            });
+        }
+    }
+
+    /**
+     *
+     * @param obj
+     * @return
+     */
+    private static List<String> prepareList(Object obj) {
+        List<String> list = new ArrayList<String>();
+        try {
+            if (obj instanceof String) {
+                list.add((String) obj);
+            } else if (obj instanceof String[]) {
+                list = Arrays.asList((String[]) obj);
+            } else if (obj instanceof List){
+                list.addAll((List<String>) obj);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        if (null != list) {
+            list = list.stream().filter(x -> org.apache.commons.lang3.StringUtils.isNotBlank(x) && !org.apache.commons.lang3.StringUtils.equals(" ", x)).collect(toList());
+        }
+        return list;
+    }
 }

ontology-engine/graph-engine_2.11/src/main/scala/org/sunbird/graph/nodes/DataNode.scala

@@ -17,7 +17,6 @@ import org.sunbird.parseq.Task
 
 import scala.collection.JavaConversions._
 import scala.concurrent.{ExecutionContext, Future}
-import org.sunbird.common.Platform
 
 
 object DataNode {
@@ -57,15 +56,10 @@ object DataNode {
         resultNode.map(node => {
             val fields: List[String] = Optional.ofNullable(request.get("fields").asInstanceOf[util.List[String]]).orElse(new util.ArrayList[String]()).toList
             val extPropNameList = DefinitionNode.getExternalProps(request.getContext.get("graph_id").asInstanceOf[String], request.getContext.get("version").asInstanceOf[String], schemaName)
-            val finalNodeFuture: Future[Node] = if (CollectionUtils.isNotEmpty(extPropNameList) && null != fields && fields.exists(field => extPropNameList.contains(field)))
+            if (CollectionUtils.isNotEmpty(extPropNameList) && null != fields && fields.exists(field => extPropNameList.contains(field)))
                 populateExternalProperties(fields, node, request, extPropNameList)
             else
                 Future(node)
-            val isBackwardCompatible = if (Platform.config.hasPath("content.tagging.backward_enable")) Platform.config.getBoolean("content.tagging.backward_enable") else false
-            if(isBackwardCompatible && !StringUtils.equalsIgnoreCase(request.get("mode").asInstanceOf[String], "edit"))
-                finalNodeFuture.map(node => updateContentTaggedProperty(node)).flatMap(f => f)
-            else
-                finalNodeFuture
         }).flatMap(f => f)  recoverWith { case e: CompletionException => throw e.getCause}
     }
 
@@ -164,33 +158,4 @@ object DataNode {
         }
         list
     }
-
-    /**
-     * To support backward compatibility to mobile team.
-     * @param node
-     * @param ec
-     * @return
-     */
-    @Deprecated
-    private def updateContentTaggedProperty(node: Node)(implicit ec:ExecutionContext): Future[Node] = {
-        val contentTaggedKeys = if(Platform.config.hasPath("content.tagging.property"))
-            (for (prop <- Platform.config.getString("content.tagging.property").split(",")) yield prop ) (collection.breakOut)
-        else
-            List("subject", "medium")
-        contentTaggedKeys.map(prop => populateContentTaggedProperty(prop, node.getMetadata.getOrDefault(prop, ""), node))
-        Future{node}
-    }
-
-    private def populateContentTaggedProperty(key:String, value: Any, node:Node)(implicit ec: ExecutionContext): Future[Node] = {
-        val contentValue:String = value match {
-            case v: String => v.asInstanceOf[String]
-            case v: List[Any] => v.head.asInstanceOf[String]
-            case v: Array[String] => v.head
-        }
-        if(!StringUtils.isAllBlank(contentValue))
-            node.getMetadata.put(key, contentValue)
-        else
-            node.getMetadata.remove(key)
-        Future(node)
-    }
 }